diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-08-25 21:31:34 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-08-25 21:31:34 +0000 |
| commit | da1485088cc11feac79b79ad372ecfe517ff5051 (patch) | |
| tree | 637a09a0da0a795855d39e32f42f78b342562169 /src | |
| parent | df98447be501ef15f911e4b118b91a94a5ef7a6a (diff) | |
| download | tor-da1485088cc11feac79b79ad372ecfe517ff5051.tar.gz tor-da1485088cc11feac79b79ad372ecfe517ff5051.zip | |
formatting cleanups
svn:r11273
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 6 | ||||
| -rw-r--r-- | src/or/routerlist.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/or/config.c b/src/or/config.c index eb67bf3013..37c60b657f 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4359,9 +4359,9 @@ or_state_validate(or_state_t *old_state, or_state_t *state, "file. Proceeding anyway.", state->TorVersion); } else { /* take action based on v */ if ((tor_version_as_new_as(state->TorVersion, "0.1.1.10-alpha") && - !tor_version_as_new_as(state->TorVersion, "0.1.2.16-dev")) - || (tor_version_as_new_as(state->TorVersion, "0.2.0.0-alpha") && - !tor_version_as_new_as(state->TorVersion, "0.2.0.6-alpha"))) { + !tor_version_as_new_as(state->TorVersion, "0.1.2.16-dev")) || + (tor_version_as_new_as(state->TorVersion, "0.2.0.0-alpha") && + !tor_version_as_new_as(state->TorVersion, "0.2.0.6-alpha"))) { log_notice(LD_CONFIG, "Detected state file from old version '%s'. " "Choosing new entry guards for you.", state->TorVersion); diff --git a/src/or/routerlist.c b/src/or/routerlist.c index ef0d6c6a3d..e686aa5a6b 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1320,7 +1320,7 @@ smartlist_choose_by_bandwidth(smartlist_t *sl, bandwidth_weight_rule_t rule, /* First count the total bandwidth weight, and make a list * of each value. <0 means "unknown; no routerinfo." We use the * bits of negative values to remember whether the router was fast (-x)&1 - * and whether it was an exit (-x)&2. Yes, it's a hack. */ + * and whether it was an exit (-x)&2 or guard (-x)&4. Yes, it's a hack. */ bandwidths = tor_malloc(sizeof(int32_t)*smartlist_len(sl)); exit_bits = bitarray_init_zero(smartlist_len(sl)); guard_bits = bitarray_init_zero(smartlist_len(sl)); |