[tor-commits] [tor/master] Merge branch 'mr/334'

[asn at torproject.org]

commit 29f07a4e9d2e7cd061e696f673c42e00885ec231
Merge: 15a95df376 7740a8b5d4
Author: George Kadianakis <desnacked at riseup.net>
Date:   Wed Mar 17 18:23:18 2021 +0200

    Merge branch 'mr/334'

 changes/bug40222                |   6 ++
 src/app/config/config.c         |   1 +
 src/app/config/or_options_st.h  |   3 +
 src/core/mainloop/connection.c  |  53 +++++++++++---
 src/core/or/relay.c             |   4 ++
 src/feature/relay/dns.c         |  11 +++
 src/feature/relay/onion_queue.c |  23 ++++---
 src/feature/relay/router.c      |   6 ++
 src/feature/stats/rephist.c     | 127 ++++++++++++++++++++++++++++++++++
 src/feature/stats/rephist.h     |  18 +++++
 src/test/test_stats.c           | 148 ++++++++++++++++++++++++++++++++++++++++
 11 files changed, 383 insertions(+), 17 deletions(-)