nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-30 23:53:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'origin/maint-0.2.2'

Browse Source
This commit is contained in:
Nick Mathewson 2011-03-15 14:50:42 -04:00
commit 84f27eb051
4 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug2683a Normal file
View File

@ -0,0 +1,3 @@
o Minor features
- Log the source of a rejected POSTed v3 networkstatus vote.

3
changes/log-typo-2011-03-15-01 Normal file
View File

@ -0,0 +1,3 @@
o Minor bugfixes
- Fix a minor typo in a log message. Bugfix on 0.2.2.6-alpha.

2
src/or/directory.c
View File

@ -3359,6 +3359,8 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers,
write_http_status_line(conn, status, "Vote stored");
} else {
tor_assert(msg);
log_warn(LD_DIRSERV, "Rejected vote from %s (\"%s\").",
conn->_base.address, msg);
write_http_status_line(conn, status, msg);
}
goto done;

2
src/or/routerparse.c
View File

@ -2822,7 +2822,7 @@ networkstatus_parse_vote_from_string(const char *s, const char **eos_out,
ns->flavor = flav = flavor;
}
if (flav != FLAV_NS && ns_type != NS_TYPE_CONSENSUS) {
log_warn(LD_DIR, "Flavor found on non-consenus networkstatus.");
log_warn(LD_DIR, "Flavor found on non-consensus networkstatus.");
goto err;
}