Merge remote-tracking branch 'mikeperry/209-path-bias-changes'

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/or/circuituse.c
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/connection_edge.c
Simple merge

diff --cc src/or/entrynodes.c
Simple merge

diff --cc src/or/entrynodes.h
index ae5d2307e7efee853d9b22f18907f71a9df31728,2686a4f34ddd3b7c563402bdba503194e7864e74..2a9a99cfbc395d21aaf6b7f8f52feefa903bdeec
--- 1/src/or/entrynodes.h
--- 2/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. */

diff --cc src/or/or.h
Simple merge

diff --cc src/or/relay.c
Simple merge