commit e1079266e73c70cc0e5141249ebf3199a849017d parent 4a8a1f76ea6cbde128f2cda49049866ea739931d Author: Nick Mathewson <nickm@torproject.org> Date: Thu, 21 Feb 2019 13:23:52 -0500 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump.