diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-01-15 22:39:15 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-01-15 22:39:15 -0500 |
| commit | 4ff97e3775316ceb500cb5d2a562ec5dfd8dfb23 (patch) | |
| tree | 77b0407257fb8cd4cb94719df396969095d69e88 /src/or/routerparse.c | |
| parent | 8e9b25e6c7a2e70c370881ab5748651b1c7de66f (diff) | |
| parent | 7699014e1e9e183d1fd840e59909bcf77ba3321b (diff) | |
| download | tor-4ff97e3775316ceb500cb5d2a562ec5dfd8dfb23.tar.gz tor-4ff97e3775316ceb500cb5d2a562ec5dfd8dfb23.zip | |
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/or/routerparse.c')
| -rw-r--r-- | src/or/routerparse.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/routerparse.c b/src/or/routerparse.c index fbceda1072..2bd370a056 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -11,6 +11,7 @@ #include "or.h" #include "config.h" +#include "circuitbuild.h" #include "dirserv.h" #include "dirvote.h" #include "policies.h" @@ -2373,7 +2374,7 @@ networkstatus_verify_bw_weights(networkstatus_t *ns) const char *casename = NULL; int valid = 1; - weight_scale = networkstatus_get_param(ns, "bwweightscale", BW_WEIGHT_SCALE); + weight_scale = circuit_build_times_get_bw_scale(ns); Wgg = networkstatus_get_bw_weight(ns, "Wgg", -1); Wgm = networkstatus_get_bw_weight(ns, "Wgm", -1); Wgd = networkstatus_get_bw_weight(ns, "Wgd", -1); |