[tor-commits] [tor/master] Merge branch 'bug30958_041' into bug30958_master

[nickm at torproject.org]

commit 2663bca39246cdf54fe43593b2e632a7bbe9af97
Merge: aec359ef6 d9f49e9bc
Author: teor <teor at torproject.org>
Date:   Tue Jun 25 12:29:28 2019 +1000

    Merge branch 'bug30958_041' into bug30958_master

 changes/bug30958           |  5 +++++
 src/feature/relay/router.c | 12 +++++++-----
 2 files changed, 12 insertions(+), 5 deletions(-)