Commit 42d6f345 authored by Nick Mathewson's avatar Nick Mathewson 🐘
Browse files

Merge remote-tracking branch 'origin/maint-0.2.2'

parents 31b9b1a5 85d4c290

changes/abandon-rend-circs-on-newnym

0 → 100644
+8 −0
Changes for changes/abandon-rend-circs-on-newnym: 8 added lines, 0 removed lines.
Original line number Diff line number Diff line 
  o Security fixes:

    - Don't attach new streams to old rendezvous circuits after SIGNAL

      NEWNYM.  Previously, we would keep using an existing rendezvous

      circuit if it remained open (i.e. if it were kept open by a

      long-lived stream or if a new stream were attached to it before

      Tor could notice that it was old and no longer in use and close

      it).  Bugfix on 0.1.1.15-rc; fixes bug 3375.

src/or/circuituse.c

+2 −1
Changes for src/or/circuituse.c: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ circuit_is_acceptable(circuit_t *circ, edge_connection_t *conn, 
      return 0;

  }



  if (purpose == CIRCUIT_PURPOSE_C_GENERAL)

  if (purpose == CIRCUIT_PURPOSE_C_GENERAL ||

      purpose == CIRCUIT_PURPOSE_C_REND_JOINED)

    if (circ->timestamp_dirty &&

       circ->timestamp_dirty+get_options()->MaxCircuitDirtiness <= now)

      return 0;