commit b645fbdb54c300dae21882c99959eddbc0be6ce1 Merge: 5527aef56f d1494d140c Author: Alexander Færøy ahf@torproject.org Date: Fri Dec 18 14:19:24 2020 +0000

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

changes/ticket33383 | 4 +++ src/core/mainloop/connection.c | 2 -- src/feature/relay/ext_orport.c | 58 ------------------------------------------ src/feature/relay/ext_orport.h | 7 ----- src/test/test_extorport.c | 55 --------------------------------------- 5 files changed, 4 insertions(+), 122 deletions(-)