commit 3e1717cd0fe6ce45a74d05043dd28dbbeb2e66f3 Merge: 9fa7866c7 b205714ba Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 3 09:48:03 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug26535.029 | 5 +++++ src/test/ntor_ref.py | 9 ++++++--- 2 files changed, 11 insertions(+), 3 deletions(-)