commit 04926126ee7fd9bbaefe5890d238fd8156124a5b Merge: e069b0af4b ccdd0d801a Author: Nick Mathewson nickm@torproject.org Date: Tue Aug 4 13:28:51 2020 -0400

Merge remote-tracking branch 'tor-gitlab/mr/100'

changes/feature30045 | 6 +++ doc/man/tor.1.txt | 14 +++++-- scripts/maint/practracker/exceptions.txt | 4 +- src/app/config/config.c | 34 ++++++++++++++++ src/app/config/or_options_st.h | 8 ++++ src/feature/relay/routerkeys.c | 27 +++++++++--- src/test/test_key_expiration.sh | 70 ++++++++++++++++++++++++++++++-- 7 files changed, 148 insertions(+), 15 deletions(-)