[tor-commits] [tor/maint-0.4.0] Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4

[teor at torproject.org]

commit b1762f8d1254a89cd181ecf41db666d9bc75fa34
Merge: 8154b33f9 85c598cbc
Author: teor <teor at torproject.org>
Date:   Fri Apr 19 11:44:38 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/638' into maint-0.3.4

 changes/bug29017 |  4 ++++
 doc/tor.1.txt    |  2 +-
 src/or/router.c  | 11 +++++------
 3 files changed, 10 insertions(+), 7 deletions(-)