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