commit 7bebd1b02551bb232fef73aa7f81c11ed6125a25 parent 5325e7ccab70383a629019323ba01d2c9215b5f4 Author: Nick Mathewson <nickm@torproject.org> Date: Tue, 24 Oct 2017 09:11:24 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 "ours" merge to avoid version bump
