commit 552688c5ccf23f48582a804a01f972e8fc715c8f Merge: 3d04e0bf7 20943d00f Author: teor teor@torproject.org Date: Mon Aug 12 13:10:10 2019 +1000

Merge branch 'maint-0.4.0' into release-0.4.0

changes/bug22619 | 3 +++ changes/bug29034 | 5 +++++ changes/bug29670 | 4 ++++ changes/bug29875 | 11 +++++++++++ changes/bug30148 | 4 ++++ changes/bug30190 | 3 +++ changes/bug30614 | 4 ++++ changes/ticket29617 | 4 ++++ src/app/config/config.c | 5 +++-- src/core/mainloop/connection.c | 33 +++++++++++++++++++++------------ src/core/or/circuituse.c | 6 ++++++ src/feature/client/entrynodes.c | 3 +++ src/feature/relay/dns.c | 3 ++- src/feature/relay/routerkeys.c | 2 +- src/lib/crypt_ops/crypto_openssl_mgt.c | 8 ++++++++ src/lib/malloc/map_anon.c | 4 ++++ src/test/test_config.c | 12 +++++------- 17 files changed, 91 insertions(+), 23 deletions(-)