diff options
| author | Nick Mathewson <nickm@torproject.org> | 2013-03-18 15:17:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-18 15:17:11 -0400 |
| commit | 5959d1c10581399efb46eeb6c0de66547894ed65 (patch) | |
| tree | 81f75fa6923b5810538b9f150f228428ca01501e /src/or/config.c | |
| parent | 3f837d4826cce0e7917e79d73b81aefc3fefc6bd (diff) | |
| parent | 0164f16f70d17da202c8085e620e9cf043eda0b3 (diff) | |
| download | tor-5959d1c10581399efb46eeb6c0de66547894ed65.tar.gz tor-5959d1c10581399efb46eeb6c0de66547894ed65.zip | |
Merge remote-tracking branch 'andrea/bug8435' into maint-0.2.4
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 2b94b8316f..da5f97eace 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -300,6 +300,7 @@ static config_var_t option_vars_[] = { V(MaxClientCircuitsPending, UINT, "32"), OBSOLETE("MaxOnionsPending"), V(MaxOnionQueueDelay, MSEC_INTERVAL, "1750 msec"), + V(MinMeasuredBWsForAuthToIgnoreAdvertised, INT, "500"), OBSOLETE("MonthlyAccountingStart"), V(MyFamily, STRING, NULL), V(NewCircuitPeriod, INTERVAL, "30 seconds"), |