commit a3b573b39269d41d71d7a0c9e56c920f96c71375 Merge: 65328fd4e 220ed863c Author: George Kadianakis desnacked@riseup.net Date: Tue Jun 23 20:31:44 2020 +0300

Merge branch 'tor-github/pr/1943'

changes/ticket40002 | 3 ++ src/core/or/circuitstats.c | 63 +----------------------------------- src/core/or/circuitstats.h | 4 +-- src/feature/control/control_cmd.c | 33 +++++++++++++++++++ src/feature/control/control_events.c | 59 +++++++++++++++++++++++++++++++++ src/feature/control/control_events.h | 2 ++ 6 files changed, 99 insertions(+), 65 deletions(-)