commit 7f2e23e7acc0735e5ae933535a1b617a0860e528 parent 00a42277eaa5838e5b7d0b07a53db01780232511 Author: Nick Mathewson <nickm@torproject.org> Date: Fri, 19 Jan 2018 16:30:12 -0500 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" merge to avoid maint-0.3.0's version of 24895.