commit 4bc88a266a333eb58352c1c5fb87acb86cde05de Merge: 8a010c8b8 747b74c18 Author: George Kadianakis desnacked@riseup.net Date: Fri Apr 5 14:51:33 2019 +0300

Merge branch 'maint-0.4.0' into release-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(+)