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

[nickm at torproject.org]

commit 499612420495da4a41b169d5478c19a8e80280d2
Merge: ea2103812 6dafddd05
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 17 14:56:52 2018 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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