commit 5f44e1e5dc9a624d36e622bb943390f627b83867 Merge: 00a93b19c 955ca72f9 Author: Nick Mathewson <nickm at torproject.org> Date: Thu Feb 21 13:25:02 2019 -0500 Merge branch 'maint-0.3.5' into maint-0.4.0 "ours" to avoid version bump.