[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/212'

[asn at torproject.org]

commit d4255253b0b417b8b02d7ba40dc4ba06b5d00d11
Merge: 60823d261c 22f55fdb2a
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Feb 8 13:03:07 2021 +0200

    Merge remote-tracking branch 'tor-gitlab/mr/212'

 changes/ticket40084                  |   4 ++
 src/core/or/or.h                     |   2 +
 src/feature/control/control_cmd.c    |  79 ++++++++++++++++++----
 src/feature/control/control_cmd.h    |   9 +++
 src/feature/control/control_events.c |   3 +
 src/feature/hs/hs_service.c          |  77 +++++++++++++++------
 src/feature/hs/hs_service.h          |  18 +++--
 src/feature/rend/rendcommon.c        |   2 +
 src/feature/rend/rendservice.c       |   1 +
 src/test/test_hs_control.c           | 126 ++++++++++++++++++++++++++++++++++-
 10 files changed, 279 insertions(+), 42 deletions(-)