commit 27f5bd52fea3a18daadc455e9e044e997753c93d Merge: d5dd500e3 0a60a94a5 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jul 19 08:31:07 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug26853 | 3 +++ src/test/test_key_expiration.sh | 8 ++++++++ 2 files changed, 11 insertions(+)