[tor-commits] [tor/master] Merge remote-tracking branch 'mikeperry/209-path-bias-changes'

[nickm@xxxxxxxxxxxxxx]

commit 885e8d35c7af65b3e1e598d6f2e951ba84e65928
Merge: 265aab2 406d59a
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Dec 25 23:30:28 2012 -0500

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

 changes/bug7157          |   26 ++
 doc/tor.1.txt            |   41 ++-
 src/or/circuitbuild.c    |  720 +++++++++++++++++++++++++++++++++++++---------
 src/or/circuitbuild.h    |    5 +-
 src/or/circuitlist.c     |   12 +-
 src/or/circuituse.c      |   33 +++
 src/or/config.c          |    7 +-
 src/or/connection_edge.c |   25 ++
 src/or/entrynodes.c      |   61 +++-
 src/or/entrynodes.h      |   22 ++-
 src/or/or.h              |   32 ++-
 src/or/relay.c           |   20 ++
 src/or/rendclient.c      |   11 +
 src/or/rendservice.c     |    8 +
 14 files changed, 838 insertions(+), 185 deletions(-)

diff --cc src/or/entrynodes.h
index ae5d230,2686a4f..2a9a99c
--- 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. */



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits