commit 12258bbb9056ae400a58de4eb57c3de079b21782 Merge: 2968c716d b205714ba Author: David Goulet dgoulet@torproject.org Date: Tue Jul 3 13:31:06 2018 -0400

Merge branch 'maint-0.2.9' into maint-0.3.1

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