diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-11-17 02:22:56 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-11-17 02:22:56 +0000 |
| commit | 6514843026222fe42fa93b01dfb4ed754beeb282 (patch) | |
| tree | 10a30a752e7248ced75f82db6c1df06df455ba1b /src | |
| parent | d6f8ba25c92430cbc0ba9f14da4c7518e309eb0e (diff) | |
| download | tor-6514843026222fe42fa93b01dfb4ed754beeb282.tar.gz tor-6514843026222fe42fa93b01dfb4ed754beeb282.zip | |
cleanups, bump to 0.2.0.12-alphator-0.2.0.12-alpha
svn:r12516
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 10 | ||||
| -rw-r--r-- | src/win32/orconfig.h | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/or/config.c b/src/or/config.c index e39017d7a3..abf919bfe1 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2888,9 +2888,6 @@ options_validate(or_options_t *old_options, or_options_t *options, *msg = tor_strdup(r >= 0 ? buf : "internal error"); return -1; } - if (options->RelayBandwidthRate > options->RelayBandwidthBurst) - REJECT("RelayBandwidthBurst must be at least equal " - "to RelayBandwidthRate."); if (options->RelayBandwidthRate && options->RelayBandwidthRate < ROUTER_REQUIRED_MIN_BANDWIDTH) { r = tor_snprintf(buf, sizeof(buf), @@ -2903,6 +2900,10 @@ options_validate(or_options_t *old_options, or_options_t *options, } } + if (options->RelayBandwidthRate > options->RelayBandwidthBurst) + REJECT("RelayBandwidthBurst must be at least equal " + "to RelayBandwidthRate."); + if (options->BandwidthRate > options->BandwidthBurst) REJECT("BandwidthBurst must be at least equal to BandwidthRate."); @@ -3189,7 +3190,8 @@ options_transition_affects_descriptor(or_options_t *old_options, !opt_streq(old_options->Nickname,new_options->Nickname) || !opt_streq(old_options->Address,new_options->Address) || !config_lines_eq(old_options->ExitPolicy,new_options->ExitPolicy) || - old_options->ExitPolicyRejectPrivate != new_options->ExitPolicyRejectPrivate || + old_options->ExitPolicyRejectPrivate != + new_options->ExitPolicyRejectPrivate || old_options->ORPort != new_options->ORPort || old_options->DirPort != new_options->DirPort || old_options->ClientOnly != new_options->ClientOnly || diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 0230ac5b03..55ac183476 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -227,6 +227,6 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.0.11-alpha-dev" +#define VERSION "0.2.0.12-alpha" |