[tor-commits] [tor/maint-0.4.1] Merge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1

[nickm at torproject.org]

commit 8803930de8c5845fdb56614fbec32604ad64bf6d
Merge: aab5f42ae 8356cc5b5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 24 13:36:10 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1130' into maint-0.4.1

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