[tor-commits] [tor/master] Merge branch 'maint-0.2.9' into maint-0.3.2

[nickm at torproject.org]

commit a4e8f945077b8eebbbd5be85f89b1631305ce1cc
Merge: e6366f787 b205714ba
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 3 09:48:03 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2

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