Commit 6961609a authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'dgoulet/bug25116_029_01'

parents a384937f 7ce8d551

changes/bug25116

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  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;

src/or/circuituse.c

+3 −3
Original line number Diff line number Diff line
@@ -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