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