Commit f8885b76 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'public/bug21128'

parents a5aec6ac 35d82709

changes/bug21128

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (client, entry guards):

    - Fix a bug warning (with backtrace) when we fail a channel

      that circuits to fallback directories on it. Fixes bug 21128;

      bugfix on 0.3.0.1-alpha.

src/or/entrynodes.c

+5 −1
Original line number Diff line number Diff line
@@ -2172,7 +2172,11 @@ entry_guard_chan_failed(channel_t *chan) 
      continue;



    origin_circuit_t *origin_circ = TO_ORIGIN_CIRCUIT(circ);

    if (origin_circ->guard_state) {

      /* We might have no guard state if we didn't use a guard on this

       * circuit (eg it's for a fallback directory). */

      entry_guard_failed(&origin_circ->guard_state);

    }

  } SMARTLIST_FOREACH_END(circ);

  smartlist_free(pending);

}