commit 7d8290f0ac99eda30926edcfce2a8652b26fd743 Merge: dde6b8906f 0c79cddc6b Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 12 08:47:05 2020 -0500 Merge remote-tracking branch 'tor-gitlab/mr/183' into master changes/bug40015 | 4 ++++ src/feature/relay/router.c | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-)