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

[teor at torproject.org]

commit 3d45079c27b94f073442f80b203f9787857c2d01
Merge: e4692fad9 92e8bdf29
Author: teor <teor at torproject.org>
Date:   Tue Apr 9 11:36:59 2019 +1000

    Merge branch 'maint-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(-)