[tor-commits] [tor/release-0.4.0] Merge branch 'release-0.4.0' of git-rw.torproject.org:/tor into release-0.4.0

[nickm at torproject.org]

commit 672c72d7d725b92e03a5d7dae01cf88b5407648f
Merge: 955d73d1e 603074ea1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 30 15:52:39 2019 -0400

    Merge branch 'release-0.4.0' of git-rw.torproject.org:/tor into release-0.4.0

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