commit 2fd02c82edbf98f14ea0ee1a8c4d48ccdb75551f Merge: a51f5b9b3 92e8bdf29 Author: teor <teor@torproject.org> Date: Tue Apr 9 11:36:55 2019 +1000 Merge branch 'maint-0.4.0' into release-0.4.0 changes/bug28614_better_logging | 6 ++++++ changes/doc29121 | 3 +++ doc/tor.1.txt | 14 +++++++++++--- src/feature/nodelist/networkstatus.c | 7 +++++-- 4 files changed, 25 insertions(+), 5 deletions(-)