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

[nickm at torproject.org]

commit 1440c4598ce1ba26d80d6f078ba5a76bca7677fa
Merge: 9e6f21c74 28d1057d5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 17 14:56:52 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

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