commit 20943d00f10af11133d9ece90f1cbed658a21aed
Merge: a1d8409ee d253b31ce
Author: teor <t...@torproject.org>
Date: Mon Aug 12 13:10:05 2019 +1000
Merge branch 'maint-0.3.5' into maint-0.4.0
changes/bug22619 | 3 +++
changes/bug29034 | 5 +++++
changes/bug29670 | 4 ++++
changes/bug29875 | 11 +++++++++++
changes/bug30148 | 4 ++++
changes/bug30190 | 3 +++
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/test/test_config.c | 12 +++++-------
15 files changed, 83 insertions(+), 23 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
