Commit 6b05d447 authored by George Kadianakis's avatar George Kadianakis
Browse files

Merge branch 'tor-github/pr/1909' into maint-0.4.3

parents 688d1b3f 39f2411b

changes/bug34303

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

    - Resume being willing to use preemptively-built circuits when

      UseEntryGuards is set to 0. We accidentally disabled this feature

      with that config setting, leading to slower load times. Fixes bug

      34303; bugfix on 0.3.3.2-alpha.

src/core/or/circuitlist.c

+1 −1
Original line number Diff line number Diff line
@@ -1943,7 +1943,7 @@ circuit_find_to_cannibalize(uint8_t purpose_to_produce, extend_info_t *info, 
      }



      /* Ignore any circuits for which we can't use the Guard. It is possible

       * that the Guard was removed from the samepled set after the circuit

       * that the Guard was removed from the sampled set after the circuit

       * was created so avoid using it. */

      if (!entry_guard_could_succeed(circ->guard_state)) {

        goto next;

src/feature/client/entrynodes.c

+7 −1
Original line number Diff line number Diff line
@@ -3452,10 +3452,16 @@ entry_guards_update_state(or_state_t *state) 
  entry_guards_dirty = 0;

}



/** Return true iff the circuit's guard can succeed that is can be used. */

/** Return true iff the circuit's guard can succeed, that is, can be used. */

int

entry_guard_could_succeed(const circuit_guard_state_t *guard_state)

{

  if (get_options()->UseEntryGuards == 0) {

    /* we're fine with this circuit's first hop, because we're not

     * configured to use entry guards. */

    return 1;

  }



  if (!guard_state) {

    return 0;

  }