commit 990322fca450d2230067a3035468c5ac7168e760 parent 38a58076e921d561fa1e488a4b0f983b12300ca4 Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 24 Oct 2017 09:11:33 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid version bump
