[tor-commits] [tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4

[nickm at torproject.org]

commit 304ee896d16dcc058a92998133ee77be24bfa735
Merge: 864564725 28d1057d5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 17 14:56:52 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

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