commit a88ce61b351412a9a62c8e2340773b5b682f1b17 parent 4b6b58ed8ec6f5870bf5825e0013339f0223fa06 Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 15 Nov 2018 16:38:19 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" merge to avoid the 0.3.3 version of #27550.