commit 872b85e689f978de79149c6f44ce4f0a76c6618a Merge: 70415c9f7 8356cc5b5 Author: teor teor@torproject.org Date: Mon Jun 24 19:47:34 2019 +1000

Merge branch 'bug30956_041' into bug30956_master

changes/bug30956 | 4 ++++ doc/tor.1.txt | 6 ++++-- src/feature/relay/router.c | 17 +++++++++++------ 3 files changed, 19 insertions(+), 8 deletions(-)