commit bf35c6ae7603e23dccde5fe272ffe7a540de0902 Merge: fc3b90b50 231036a11 Author: teor teor@torproject.org Date: Fri Apr 19 12:00:46 2019 +1000

Merge branch 'maint-0.3.5' into release-0.3.5

changes/bug13221 | 5 +++++ changes/bug27199 | 3 +++ changes/bug28698 | 3 +++ changes/bug29017 | 4 ++++ changes/bug29144 | 5 +++++ changes/bug29665 | 7 +++++++ doc/tor.1.txt | 2 +- src/app/config/config.c | 8 ++++---- src/core/mainloop/connection.c | 2 +- src/core/or/circuituse.c | 34 ++++++++++++++++++++++------------ src/feature/relay/router.c | 11 +++++------ src/rust/Cargo.toml | 11 +++++++++++ 12 files changed, 71 insertions(+), 24 deletions(-)