Merge branch 'maint-0.2.2'

Conflicts:
	src/or/dirserv.c

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

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

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

diff --cc src/or/dirserv.c
index e4cbcaaded0a844a1c01bb00103be1168982b87b,19d9702a9683b562f137d138e20e67a754f2cd32..64db94df31a284cdc5908d078b5209a05fbd65e3
--- 1/src/or/dirserv.c
--- 2/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(

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