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/circuitlist.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/circuitlist.c')
| -rw-r--r-- | src/or/circuitlist.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index d033cc6321..d5c74ee7b6 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -382,7 +382,9 @@ circuit_purpose_to_controller_string(uint8_t purpose) int32_t circuit_initial_package_window(void) { - int32_t num = networkstatus_get_param(NULL, "circwindow", CIRCWINDOW_START); + int32_t num = networkstatus_get_param(NULL, "circwindow", CIRCWINDOW_START, + CIRCWINDOW_START_MIN, + CIRCWINDOW_START_MAX); /* If the consensus tells us a negative number, we'd assert. */ if (num < 0) num = CIRCWINDOW_START; |