commit 13d2a46621cc28dacf8394521d7f8f5f458ab2dc Merge: 1d9e1da6e d253b31ce Author: teor teor@torproject.org Date: Mon Aug 12 13:09:36 2019 +1000

Merge branch 'maint-0.3.5' into release-0.3.5

changes/29241_diagnostic | 4 ++++ changes/bug22619 | 3 +++ changes/bug29034 | 5 ++++ changes/bug29241 | 6 +++++ changes/bug29670 | 4 ++++ changes/bug29875 | 11 +++++++++ changes/bug30040 | 9 +++++++ changes/bug30148 | 4 ++++ changes/bug30189 | 4 ++++ changes/bug30190 | 3 +++ changes/bug30316 | 4 ++++ changes/bug30452 | 3 +++ changes/cid1444119 | 3 +++ changes/ticket29617 | 4 ++++ changes/ticket30454 | 10 ++++++++ doc/tor.1.txt | 17 ++++++++----- src/app/config/config.c | 18 ++++++++++++-- src/app/main/main.c | 1 + src/config/torrc.sample.in | 21 ++++++++++++---- src/core/mainloop/connection.c | 33 +++++++++++++++---------- src/core/or/circuituse.c | 6 +++++ src/ext/getdelim.c | 3 ++- src/feature/client/entrynodes.c | 3 +++ src/feature/dirauth/authmode.h | 4 ++++ src/feature/dirauth/dirvote.c | 7 +++--- src/feature/dircommon/consdiff.c | 2 +- src/feature/hs/hs_cell.c | 16 +++++++------ src/feature/hs/hs_cell.h | 13 ---------- src/feature/hs/hs_client.c | 18 +++++++------- src/feature/hs/hs_intropoint.c | 27 +++++++++++---------- src/feature/hs/hs_intropoint.h | 15 ------------ src/feature/relay/dns.c | 3 ++- src/feature/relay/routerkeys.c | 2 +- src/lib/crypt_ops/crypto_openssl_mgt.c | 8 +++++++ src/lib/log/util_bug.c | 14 +++++++++++ src/lib/log/util_bug.h | 8 ++++--- src/lib/tls/tortls_nss.c | 40 +++++++++++++++++++++++++++++++ src/test/test_config.c | 12 ++++------ src/test/test_hs_cell.c | 2 +- src/test/test_hs_intropoint.c | 4 ++-- src/trunnel/hs/cell_introduce1.c | 44 +++++++++++++--------------------- src/trunnel/hs/cell_introduce1.h | 7 ++++++ src/trunnel/hs/cell_introduce1.trunnel | 21 +++++++++++++--- 43 files changed, 313 insertions(+), 133 deletions(-)