[tor-commits] [tor/maint-0.4.2] Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5

[teor at torproject.org]

commit d2e4262ebc134f4c6ae9e702a14da45489575b4f
Merge: 6bfdd0967 2da4d64a6
Author: teor <teor at torproject.org>
Date:   Wed Nov 6 11:17:01 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5

 changes/bug30916           |  4 ++++
 src/feature/relay/router.c | 18 ++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)