[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

[teor at torproject.org]

commit 4961a0ae9018ba395d3fbee0a38763deeb1a98da
Merge: 3209b4f77 d175e7081
Author: teor <teor at torproject.org>
Date:   Wed Oct 23 08:47:05 2019 +1000

    Merge branch 'maint-0.3.5' into release-0.3.5

 .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(-)