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