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

[asn at torproject.org]

commit 847fc3280d4a77859c28f4c6c91c2cdf863c5c43
Merge: f2800b53a e1d4e2bad
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Apr 30 19:26:30 2019 +0300

    Merge branch 'maint-0.4.0'

 changes/bug29930                     |  4 ++++
 src/feature/nodelist/networkstatus.c | 18 +++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)