commit fa6296df3afb6824f0610aabaef486c4b4b4c82c Merge: 2afba291b cbce8dedd Author: teor teor@torproject.org Date: Fri Apr 19 12:00:36 2019 +1000

Merge branch 'maint-0.3.4' into release-0.3.4

changes/bug27199 | 3 +++ changes/bug29017 | 4 ++++ changes/bug29665 | 7 +++++++ doc/tor.1.txt | 2 +- src/or/circuituse.c | 4 ++++ src/or/router.c | 11 +++++------ src/rust/Cargo.toml | 10 ++++++++++ 7 files changed, 34 insertions(+), 7 deletions(-)