diff options
| author | Nick Mathewson <nickm@torproject.org> | 2010-04-13 13:37:33 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2010-04-13 13:37:33 -0400 |
| commit | fe57aab2832160d1c256aa9d6e70cd5e1cd29aa4 (patch) | |
| tree | 011a9e53889fa6bb87e14cf84da2af77a138a6f2 /src | |
| parent | 7221d15acc87d2438aba7e3c261c2fc460479a01 (diff) | |
| parent | 96a0edf373b52da382206d12716ebd1cb96a1518 (diff) | |
| download | tor-fe57aab2832160d1c256aa9d6e70cd5e1cd29aa4.tar.gz tor-fe57aab2832160d1c256aa9d6e70cd5e1cd29aa4.zip | |
Merge branch 'correct_halflife'
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/relay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/relay.c b/src/or/relay.c index 599d3d9c80..fab2d8896e 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1865,9 +1865,9 @@ cell_ewma_set_scale_factor(or_options_t *options, networkstatus_t *consensus) source = "CircuitPriorityHalflife in configuration"; } else if (consensus && (halflife_ms = networkstatus_get_param( - consensus, "CircPriorityHalflifeMsec", -1) >= 0)) { + consensus, "CircuitPriorityHalflifeMsec", -1)) >= 0) { halflife = ((double)halflife_ms)/1000.0; - source = "CircPriorityHalflifeMsec in consensus"; + source = "CircuitPriorityHalflifeMsec in consensus"; } else { halflife = EWMA_DEFAULT_HALFLIFE; source = "Default value"; |