[tor-commits] [tor/master] Merge branch 'maint-0.3.4'

[nickm at torproject.org]

commit b44fce67163cadbb951005416808b9b217c67639
Merge: 144fc9bef 27f5bd52f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 19 08:32:00 2018 -0400

    Merge branch 'maint-0.3.4'

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