commit 989b6325d671744aacec191b181e8b0b0fee35be Merge: e028ec6bb b71febcea Author: George Kadianakis desnacked@riseup.net Date: Tue Mar 26 16:41:07 2019 +0200

Merge branch 'tor-github/pr/842'

changes/ticket29894 | 4 + scripts/maint/practracker/exceptions.txt | 40 +- src/app/config/config.c | 2 + src/app/config/statefile.c | 2 +- src/app/main/main.c | 2 + src/core/include.am | 10 + src/core/mainloop/connection.c | 1 + src/core/mainloop/mainloop.c | 1 + src/core/or/circuitbuild.c | 2 +- src/core/or/circuitlist.c | 2 +- src/core/or/circuitstats.c | 2 +- src/core/or/circuituse.c | 2 +- src/core/or/command.c | 2 +- src/core/or/connection_edge.c | 2 +- src/core/or/connection_or.c | 2 +- src/core/or/relay.c | 2 +- src/core/proto/proto_socks.c | 2 +- src/feature/client/addressmap.c | 2 +- src/feature/client/dnsserv.c | 2 +- src/feature/client/entrynodes.c | 2 +- src/feature/client/transports.c | 2 +- src/feature/control/btrack_orconn_cevent.c | 2 +- src/feature/control/control.c | 7564 +--------------------------- src/feature/control/control.h | 386 +- src/feature/control/control_auth.c | 439 ++ src/feature/control/control_auth.h | 27 + src/feature/control/control_bootstrap.c | 2 +- src/feature/control/control_cmd.c | 2323 +++++++++ src/feature/control/control_cmd.h | 48 + src/feature/control/control_events.c | 2317 +++++++++ src/feature/control/control_events.h | 351 ++ src/feature/control/control_fmt.c | 409 ++ src/feature/control/control_fmt.h | 36 + src/feature/control/control_getinfo.c | 1662 ++++++ src/feature/control/control_getinfo.h | 57 + src/feature/dirclient/dirclient.c | 2 +- src/feature/hibernate/hibernate.c | 2 +- src/feature/hs/hs_control.c | 2 +- src/feature/nodelist/dirlist.c | 2 +- src/feature/nodelist/networkstatus.c | 2 +- src/feature/nodelist/nodelist.c | 2 +- src/feature/nodelist/routerlist.c | 2 +- src/feature/relay/dns.c | 2 +- src/feature/relay/ext_orport.c | 3 +- src/feature/relay/router.c | 2 +- src/feature/relay/selftest.c | 2 +- src/feature/rend/rendclient.c | 2 +- src/feature/rend/rendcommon.c | 2 +- src/feature/rend/rendservice.c | 2 +- src/feature/stats/geoip_stats.c | 2 +- src/test/test_controller.c | 5 +- src/test/test_controller_events.c | 3 +- src/test/test_dir.c | 4 +- src/test/test_extorport.c | 2 +- src/test/test_hs.c | 4 +- src/test/test_hs_control.c | 4 +- src/test/test_pt.c | 3 +- src/test/test_util.c | 2 +- src/test/testing_common.c | 1 + 59 files changed, 8027 insertions(+), 7743 deletions(-)