commit 586c327e072ec5a85fcb93cc64e703e201251eb2 parent 0e85b71066d6341e817529c6a697b3f95e113564 Author: Nick Mathewson <nickm@torproject.org> Date: Mon, 18 Sep 2017 14:40:43 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1 "ours" to avoid version bump.