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

[nickm at torproject.org]

commit 61a2762e353f29b8b4402bf068e6268809174702
Merge: 98ee23ca1 6dafddd05
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 17 14:56:52 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2

 changes/bug26830        | 3 +++
 src/test/test_keygen.sh | 8 ++++++++
 2 files changed, 11 insertions(+)