[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

[arma at torproject.org]

commit 6a76007b089a2ca31b67b2ce15dd28edeb416428
Merge: c9f24ed 97a209e
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Nov 21 18:36:49 2011 -0500

    Merge branch 'maint-0.2.2'
    
    Conflicts:
    	src/or/dirserv.c

 changes/bug4518     |    4 ++++
 changes/feature4484 |    8 ++++++++
 doc/tor.1.txt       |   10 ++++++++++
 src/or/config.c     |    8 ++++++++
 src/or/cpuworker.c  |   14 ++++++++++++--
 src/or/dirserv.c    |   24 ++++++++++++------------
 src/or/or.h         |    8 ++++++++
 7 files changed, 62 insertions(+), 14 deletions(-)

diff --cc src/or/dirserv.c
index e4cbcaa,19d9702..64db94d
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@@ -2397,13 -2357,13 +2397,13 @@@ set_routerstatus_from_routerinfo(router
      rs->is_named = (naming && (name_status & FP_NAMED)) ? 1 : 0;
      rs->is_unnamed = (naming && (name_status & FP_UNNAMED)) ? 1 : 0;
    }
 -  rs->is_valid = ri->is_valid;
 +  rs->is_valid = node->is_valid;
  
 -  if (rs->is_fast &&
 +  if (node->is_fast &&
-       (router_get_advertised_bandwidth(ri) >= BANDWIDTH_TO_GUARANTEE_GUARD ||
-        router_get_advertised_bandwidth(ri) >=
-                               MIN(guard_bandwidth_including_exits,
-                                   guard_bandwidth_excluding_exits)) &&
+       ((options->AuthDirGuardBWGuarantee &&
+         routerbw >= options->AuthDirGuardBWGuarantee) ||
+        routerbw >= MIN(guard_bandwidth_including_exits,
+                        guard_bandwidth_excluding_exits)) &&
        (options->GiveGuardFlagTo_CVE_2011_2768_VulnerableRelays ||
         is_router_version_good_for_possible_guard(ri->platform))) {
      long tk = rep_hist_get_weighted_time_known(