[tor-commits] [tor/master] Merge branch 'bug30958_035' into bug30958_040

[nickm at torproject.org]

commit e350dfc085b6632d0134b11751496ace72c27184
Merge: afa2c39ba b7dda83cf
Author: teor <teor at torproject.org>
Date:   Mon Jun 24 21:31:10 2019 +1000

    Merge branch 'bug30958_035' into bug30958_040

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