[tor-commits] [tor/master] Merge branch 'bug40249_squashed'

[nickm at torproject.org]

commit 90add50550f2e101de5383e926d1f2729d8987ce
Merge: 177b535e72 d159bdb0f4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Feb 8 10:31:30 2021 -0500

    Merge branch 'bug40249_squashed'

 changes/ticket40249                  |  3 +++
 src/app/config/config.c              |  2 +-
 src/core/or/circuituse.c             |  7 ++++++-
 src/core/or/connection_edge.c        | 12 +++++++++---
 src/feature/client/addressmap.c      | 15 ++++++++++-----
 src/feature/client/addressmap.h      |  2 +-
 src/feature/control/control_cmd.c    |  2 +-
 src/feature/control/control_events.c | 29 +++++++++++++++++++----------
 src/feature/control/control_events.h |  2 +-
 src/test/test_entryconn.c            |  4 ++--
 10 files changed, 53 insertions(+), 25 deletions(-)