commit f23d4df091a3b4c3933d041481316f624cdb98d1 Merge: fe68d83b2 cb1127606 Author: George Kadianakis desnacked@riseup.net Date: Thu Nov 21 13:03:44 2019 +0200

Merge branch 'tor-github/pr/1555'

changes/ticket30382 | 5 +++++ doc/tor.1.txt | 18 ++++++++++++------ src/core/or/connection_edge.c | 2 +- src/lib/net/socks5_status.h | 1 + 4 files changed, 19 insertions(+), 7 deletions(-)