commit 8a49a44111e239aa1d2d0aa142ab1ae994715a56 Merge: 8747627d8 61a2762e3 Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 17 14:56:52 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

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