Merge branch 'bug24895_031_02' into bug24895_032_02
commitf870f9c8bcdbf2f8fd1c1e1feb9f88dc111ab25a
authorDavid Goulet <dgoulet@torproject.org>
Fri, 19 Jan 2018 21:26:26 +0000 (19 16:26 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Fri, 19 Jan 2018 21:26:26 +0000 (19 16:26 -0500)
tree1725d467f118be34c702ec94c041ca8b6d788f35
parent44388757c44834d63614c4e13cf88931992afc2a
parentf98f7ca89865d1a477fc65165b92c86b9d8437fa
Merge branch 'bug24895_031_02' into bug24895_032_02
src/or/hs_circuit.c
src/or/hs_common.c
src/or/hs_common.h
src/or/rendservice.c