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