[tor-commits] [tor/master] Merge remote-tracking branch 'mikeperry/bug24946'
nickm at torproject.org
nickm at torproject.org
Tue Jan 23 19:09:35 UTC 2018
commit 6f4ee6e5e78112f78687fa0617e2cdeb2899f7d6
Merge: 58f4aee90 db5b670d8
Author: Nick Mathewson <nickm at torproject.org>
Date: Tue Jan 23 14:08:47 2018 -0500
Merge remote-tracking branch 'mikeperry/bug24946'
changes/bug24946 | 5 +++++
src/or/circuituse.c | 2 ++
src/or/connection_edge.c | 3 +++
src/or/hs_circuit.c | 6 +++++-
src/or/rendservice.c | 7 ++++++-
5 files changed, 21 insertions(+), 2 deletions(-)
More information about the tor-commits
mailing list