Commit 12cf73c4 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'andrea/ticket19858_v2' 

Conflict in entrynodes.c: any_bridge_supports_microdescriptors was
removed in master, and modified in 19858_v2
parents ec4142ab 1c6f8841

changes/ticket19858

0 → 100644
+4 −0
Original line number Diff line number Diff line 
  o Features (guards):

    - Abolish all global guard context in entrynodes.c; replace with new

      guard_selection_t structure as preparation for prop. 271.  Closes

      ticket 19858.

src/or/circuitbuild.c

+0 −1
Original line number Diff line number Diff line
@@ -2235,7 +2235,6 @@ choose_good_entry_server(uint8_t purpose, cpath_build_state_t *state) 
   * This is an incomplete fix, but is no worse than the previous behaviour,

   * and only applies to minimal, testing tor networks

   * (so it's no less secure) */

  /*XXXX++ use the using_as_guard flag to accomplish this.*/

  if (options->UseEntryGuards

      && (!options->TestingTorNetwork ||

         smartlist_len(nodelist_get_list()) > smartlist_len(get_entry_guards())