Unverified Commit ecbc2e80 authored by teor's avatar teor
Browse files

Merge remote-tracking branch 'tor-github/pr/747' into maint-0.2.9

parents 4d9eb4dd 7ce8d551
o Minor bugfixes (hidden service, heartbeat):
- Don't log in the heartbeat any long term established one hop rendezvous
points if tor is a single onion service. Fixes bug 25116; bugfix on
0.2.9.6-rc;
......@@ -808,10 +808,10 @@ circuit_log_ancient_one_hop_circuits(int age)
if (circ->timestamp_created.tv_sec >= cutoff)
continue;
/* Single Onion Services deliberately make long term one-hop intro
* connections. We only ignore active intro point connections, if we take
* a long time establishing, that's worth logging. */
* and rendezvous connections. Don't log the established ones. */
if (rend_service_allow_non_anonymous_connection(options) &&
circ->purpose == CIRCUIT_PURPOSE_S_INTRO)
(circ->purpose == CIRCUIT_PURPOSE_S_INTRO ||
circ->purpose == CIRCUIT_PURPOSE_S_REND_JOINED))
continue;
/* Tor2web deliberately makes long term one-hop rend connections,
* particularly when Tor2webRendezvousPoints is used. We only ignore
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment