Merge remote branch 'origin/maint-0.2.2'

changes/bug2683a

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

changes/log-typo-2011-03-15-01

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

src/or/directory.c

@@ -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;

src/or/routerparse.c

@@ -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;
   }