nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
teor 2019-03-01 14:14:26 +10:00
commit ecbc2e80a0
No known key found for this signature in database
GPG Key ID: 10FEAA0E7075672A
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug25116 Normal file
View File

@ -0,0 +1,4 @@
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;

6
src/or/circuituse.c
View File

@ -808,10 +808,10 @@ circuit_log_ancient_one_hop_circuits(int age)
if (circ->timestamp_created.tv_sec >= cutoff) if (circ->timestamp_created.tv_sec >= cutoff)
continue; continue;
/* Single Onion Services deliberately make long term one-hop intro /* Single Onion Services deliberately make long term one-hop intro
* connections. We only ignore active intro point connections, if we take * and rendezvous connections. Don't log the established ones. */
* a long time establishing, that's worth logging. */
if (rend_service_allow_non_anonymous_connection(options) && 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; continue;
/* Tor2web deliberately makes long term one-hop rend connections, /* Tor2web deliberately makes long term one-hop rend connections,
* particularly when Tor2webRendezvousPoints is used. We only ignore * particularly when Tor2webRendezvousPoints is used. We only ignore