[tor-commits] [tor/master] Merge branch 'maint-0.4.1'

[asn at torproject.org]

commit 2944b091fcd0d614f39e89eb22a8f943ff77dc71
Merge: 91f04d006 bb33a2f29
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Jul 24 12:32:06 2019 +0300

    Merge branch 'maint-0.4.1'

 changes/bug31003                  |  4 ++++
 src/feature/nodelist/routerlist.c | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)