Merge branch 'tor-github/pr/1040'

changes/ticket29976

src/app/main/main.c

src/core/or/circuitbuild.c

src/core/or/circuitlist.c

src/core/or/connection_or.c

src/core/or/ocirc_event.c

src/core/or/ocirc_event.h

src/core/or/orconn_event.c

src/core/or/orconn_event.h

src/feature/control/btrack.c

src/feature/control/btrack_circuit.c

src/feature/control/btrack_circuit.h

src/feature/control/btrack_orconn.c

src/feature/control/btrack_orconn.h

src/lib/pubsub/pubsub_check.c

src/test/test_btrack.c

src/test/test_circuitstats.c

src/test/test_controller_events.c

src/test/test_extorport.c

src/test/test_helpers.c