From: Nick Mathewson Date: Wed, 26 Dec 2012 04:30:28 +0000 (-0500) Subject: Merge remote-tracking branch 'mikeperry/209-path-bias-changes' X-Git-Tag: tor-0.2.4.8-alpha~18 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=885e8d35c7af65b3e1e598d6f2e951ba84e65928;p=thirdparty%2Ftor.git Merge remote-tracking branch 'mikeperry/209-path-bias-changes' --- 885e8d35c7af65b3e1e598d6f2e951ba84e65928 diff --cc src/or/entrynodes.h index ae5d2307e7,2686a4f34d..2a9a99cfbc --- a/src/or/entrynodes.h +++ b/src/or/entrynodes.h @@@ -31,11 -31,14 +31,15 @@@ typedef struct entry_guard_t * router, 1 if we have. */ unsigned int can_retry : 1; /**< Should we retry connecting to this entry, * in spite of having it marked as unreachable?*/ - unsigned int path_bias_notice : 1; /**< Did we alert the user about path bias + unsigned int path_bias_noticed : 1; /**< Did we alert the user about path + * bias for this node already? */ + unsigned int path_bias_warned : 1; /**< Did we alert the user about path bias * for this node already? */ + unsigned int path_bias_extreme : 1; /**< Did we alert the user about path + * bias for this node already? */ unsigned int path_bias_disabled : 1; /**< Have we disabled this node because * of path bias issues? */ + unsigned int is_dir_cache : 1; /**< Is this node a directory cache? */ time_t bad_since; /**< 0 if this guard is currently usable, or the time at * which it was observed to become (according to the * directory or the user configuration) unusable. */