[tor-commits] [tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
nickm at torproject.org
nickm at torproject.org
Mon Jul 30 13:02:04 UTC 2018
commit 56fd0249f288998a81d00456416e2e42dea1e246
Merge: 1a57de97a 21babc8d3
Author: Nick Mathewson <nickm at torproject.org>
Date: Mon Jul 30 09:01:59 2018 -0400
Merge branch 'maint-0.3.4' into release-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(-)
More information about the tor-commits
mailing list