commit 21babc8d3f138be94336cad40168390ed9509793
Merge: 7d66ec0fe 4f854dbdc
Author: Nick Mathewson <ni...@torproject.org>
Date: Mon Jul 30 09:01:59 2018 -0400
Merge branch 'maint-0.3.3' into maint-0.3.4
changes/bug26627 | 7 +++++++
src/or/hs_circuit.c | 20 ++++++++++++++------
src/or/hs_service.c | 29 ++++++++++++++++++++---------
src/or/hs_service.h | 5 +++--
src/test/test_hs_cell.c | 4 ++--
src/test/test_hs_intropoint.c | 4 ++--
src/test/test_hs_service.c | 2 +-
7 files changed, 49 insertions(+), 22 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
