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

[asn at torproject.org]

commit 574c20767059a9c39b33181a4792ac4aa7c71ba4
Merge: 1779878f9 747b74c18
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri Apr 5 14:51:33 2019 +0300

    Merge branch 'maint-0.4.0'

 changes/ticket29357            |  7 +++++++
 doc/tor.1.txt                  | 15 +++++++++++++++
 src/app/config/config.c        |  1 +
 src/app/config/or_options_st.h |  5 +++++
 src/core/mainloop/netstatus.c  |  4 ++++
 src/test/test_mainloop.c       |  8 ++++++++
 6 files changed, 40 insertions(+)