commit ff05162710cb514b3c0c054b034dc9c2bd66e97d parent bbdf56aed625b67a8675ad3441afe76198a8a8bc Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 2 Nov 2018 09:08:53 -0400 Merge branch 'maint-0.3.4' into maint-0.3.5 "ours" to avoid version bump.