commit 57acdaa3f14db52efb5e9ae2be3e54ddbf17bad9
Merge: 641f13044 d175e7081
Author: teor <t...@torproject.org>
Date: Wed Oct 23 08:47:08 2019 +1000
Merge branch 'maint-0.3.5' into maint-0.4.0
changes/bug12399 | 3 +++
changes/bug23507 | 5 +++++
changes/bug23818_v2 | 6 ++++++
changes/bug23818_v3 | 6 ++++++
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 +++++++++++++++----
9 files changed, 84 insertions(+), 19 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
