diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-02-06 12:13:41 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-02-06 12:13:41 -0500 |
| commit | 6961609a1c62fb25b305c60e4d3ad49263da834c (patch) | |
| tree | 4e8456c8f9d7aad43cde027b68f44c5574c0de55 | |
| parent | a384937f848dc2e7b45c4b4be49467eac2a2db19 (diff) | |
| parent | 7ce8d5513ba388259e4e251d49183ef0fe9c8fa8 (diff) | |
| download | tor-6961609a1c62fb25b305c60e4d3ad49263da834c.tar.gz tor-6961609a1c62fb25b305c60e4d3ad49263da834c.zip | |
Merge remote-tracking branch 'dgoulet/bug25116_029_01'
| -rw-r--r-- | changes/bug25116 | 4 | ||||
| -rw-r--r-- | src/or/circuituse.c | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/changes/bug25116 b/changes/bug25116 new file mode 100644 index 0000000000..b3e73feeaa --- /dev/null +++ b/changes/bug25116 @@ -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; diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 3a14a3ccfc..700aa92ac7 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -875,10 +875,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 |