[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
nickm at torproject.org
nickm at torproject.org
Thu Nov 2 14:22:44 UTC 2017
commit aed642a4b277ec46bd40913735ae82c0baf10f5a
Merge: 588be5b02 6a9a118f9
Author: Nick Mathewson <nickm at torproject.org>
Date: Thu Nov 2 10:22:35 2017 -0400
Merge branch 'maint-0.3.2' into release-0.3.2
changes/bug23820 | 5 ++++
src/or/hs_circuit.c | 66 ++++++++++++++++++++++++++++++++++-----------
src/or/hs_client.c | 27 ++++++++++++++++---
src/or/hs_common.c | 78 ++++++++++++++++++++---------------------------------
src/or/hs_config.c | 16 ++++++++---
src/or/hs_service.c | 50 ++++++++++++++++++++--------------
src/test/include.am | 4 ++-
7 files changed, 153 insertions(+), 93 deletions(-)
More information about the tor-commits
mailing list