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/relay.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/relay.c')
| -rw-r--r-- | src/or/relay.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index c2035b0266..ec8e9ac8da 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1993,9 +1993,9 @@ cell_ewma_set_scale_factor(or_options_t *options, networkstatus_t *consensus) if (options && options->CircuitPriorityHalflife >= -EPSILON) { halflife = options->CircuitPriorityHalflife; source = "CircuitPriorityHalflife in configuration"; - } else if (consensus && - (halflife_ms = networkstatus_get_param( - consensus, "CircuitPriorityHalflifeMsec", -1)) >= 0) { + } else if (consensus && (halflife_ms = networkstatus_get_param( + consensus, "CircuitPriorityHalflifeMsec", + -1, -1, INT32_MAX)) >= 0) { halflife = ((double)halflife_ms)/1000.0; source = "CircuitPriorityHalflifeMsec in consensus"; } else { |