diff options
| author | Roger Dingledine <arma@torproject.org> | 2012-09-05 16:46:23 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2012-09-05 16:46:23 -0400 |
| commit | 59deac92a1b9bea4c1340c7aa533e3105c7df266 (patch) | |
| tree | 369be693339c003954401d20fd9964710596dd77 | |
| parent | 5ee0fdafff69eb99a9a9980512196c33bf26bce6 (diff) | |
| parent | 97dbff51e60273b29d7dc15e4106c600e8efa34e (diff) | |
| download | tor-59deac92a1b9bea4c1340c7aa533e3105c7df266.tar.gz tor-59deac92a1b9bea4c1340c7aa533e3105c7df266.zip | |
Merge branch 'maint-0.2.3' into release-0.2.3
| -rw-r--r-- | changes/bug6774 | 4 | ||||
| -rw-r--r-- | doc/tor.1.txt | 4 | ||||
| -rw-r--r-- | src/or/circuitbuild.c | 6 |
3 files changed, 12 insertions, 2 deletions
diff --git a/changes/bug6774 b/changes/bug6774 new file mode 100644 index 0000000000..0c137fd678 --- /dev/null +++ b/changes/bug6774 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Avoid crashing on a malformed state file where EntryGuardPathBias + precedes EntryGuard. Fix for bug 6774; bugfix on 0.2.3.17-beta. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 62259b7268..0bd970965a 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -126,8 +126,8 @@ GENERAL OPTIONS A token bucket limits the average incoming bandwidth usage on this node to the specified number of bytes per second, and the average outgoing bandwidth usage to that same value. If you want to run a relay in the - public network, this needs to be _at the very least_ 20 KB (that is, - 20480 bytes). (Default: 5 MB) + public network, this needs to be _at the very least_ 30 KB (that is, + 30720 bytes). (Default: 5 MB) **BandwidthBurst** __N__ **bytes**|**KB**|**MB**|**GB**:: Limit the maximum token bucket size (also known as the burst) to the given diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index e5576018a6..9d52b5e021 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -4877,6 +4877,12 @@ entry_guards_parse_state(or_state_t *state, int set, char **msg) const or_options_t *options = get_options(); unsigned hop_cnt, success_cnt; + if (!node) { + *msg = tor_strdup("Unable to parse entry nodes: " + "EntryGuardPathBias without EntryGuard"); + break; + } + if (tor_sscanf(line->value, "%u %u", &success_cnt, &hop_cnt) != 2) { log_warn(LD_GENERAL, "Unable to parse guard path bias info: " "Misformated EntryGuardPathBias %s", escaped(line->value)); |