commit 374626c09b8c3f5752a99eeee16ac8654cf531a1 Merge: dc4f3a219 7b2ab93f6 Author: David Goulet dgoulet@torproject.org Date: Thu Jun 25 13:35:34 2020 -0400

Merge branch 'tor-github/pr/1917'

changes/ticket30642 | 4 ++++ src/app/main/main.c | 2 ++ src/feature/relay/router.c | 60 ++++++++++++++++++++++++++++------------------ src/feature/relay/router.h | 2 +- src/test/test_routerkeys.c | 53 +++++++++++++++++++++++++++++++++++++--- 5 files changed, 94 insertions(+), 27 deletions(-)