commit d4d189964aa81fe033dd8910bbf73b132d5c7da5 Merge: 2da3e3f70 57acdaa3f Author: teor teor@torproject.org Date: Wed Oct 23 08:47:12 2019 +1000

Merge branch 'maint-0.4.0' into release-0.4.0

.appveyor.yml | 6 +++--- .travis.yml | 6 ++++-- changes/bug12399 | 3 +++ changes/bug23507 | 5 +++++ changes/bug23818_v2 | 6 ++++++ changes/bug23818_v3 | 6 ++++++ changes/ticket31372_appveyor | 4 ++++ changes/ticket31372_travis | 4 ++++ src/feature/hs/hs_circuit.c | 28 ++++++++++++++++++++++------ src/feature/hs/hs_circuit.h | 3 ++- src/feature/hs/hs_service.c | 30 +++++++++++++++++++++++------- src/feature/rend/rendmid.c | 3 ++- src/feature/rend/rendservice.c | 19 +++++++++++++++---- 13 files changed, 99 insertions(+), 24 deletions(-)