commit 7a2fe935293fa50d7a9db0897450ba1e24f758af Merge: 92fc0d3699 fbee4d25cc Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 21 09:03:38 2020 -0400

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

src/feature/relay/router.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)