commit 0afa0bc167860c13821ed3e84c68744045ed6938 Merge: 444e9b37c 389bae0e8 Author: Nick Mathewson <nickm at torproject.org> Date: Wed Oct 17 14:46:10 2018 -0400 Merge branch 'maint-0.3.5' "ours" to avoid version bump.