commit 28d1057d5658a47dfcaa52c163e5861b4db5670a Merge: 710188f84 61a2762e3 Author: Nick Mathewson <nickm@torproject.org> Date: Tue Jul 17 14:56:52 2018 -0400 Merge branch 'maint-0.3.2' into maint-0.3.3 changes/bug26830 | 3 +++ src/test/test_keygen.sh | 8 ++++++++ 2 files changed, 11 insertions(+)