commit b205714ba8fd65340e6f282db95663390d5d492e Merge: 1953a7e61 fc5f8b693 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 3 09:47:41 2018 -0400

Merge branch 'bug26535_029' into maint-0.2.9

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