[tor-commits] [tor/master] Merge branch 'tor-github/pr/1341'

[asn at torproject.org]

commit 0a77e5f1c23d43d25a10436dcd30adb4596762fb
Merge: 09769779a 4bbefc2aa
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Sep 25 14:18:15 2019 +0300

    Merge branch 'tor-github/pr/1341'

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