commit 12afdcc15a8429bcc50d9287321849b6fa924c2f Merge: 6fd301fa8 304ee896d Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 17 14:56:52 2018 -0400

Merge branch 'maint-0.3.4'

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