Merge remote-tracking branch 'public/bug14261_025'

Conflicts:
	src/or/directory.c

diff --cc src/or/directory.c
index 7b4020080cd8f9bdf98deb17bf5defbe0f70e585,50863d0c7e5b0b191acd667243c4158af7da174e..4f24f84d9ca7cf430e45c31d3f3daeb991b4b086
--- 1/src/or/directory.c
--- 2/src/or/directory.c
+++ b/src/or/directory.c
@@@ -2225,11 -2210,13 +2228,15 @@@ connection_dir_process_inbuf(dir_connec
      return 0;
    }
  
-   if (connection_get_inbuf_len(TO_CONN(conn)) > MAX_DIRECTORY_OBJECT_SIZE) {
+   max_size =
+     (TO_CONN(conn)->purpose == DIR_PURPOSE_FETCH_STATUS_VOTE) ?
+     MAX_VOTE_DL_SIZE : MAX_DIRECTORY_OBJECT_SIZE;
+ 
+   if (connection_get_inbuf_len(TO_CONN(conn)) > max_size) {
 -    log_warn(LD_HTTP, "Too much data received from directory connection: "
 -             "denial of service attempt, or you need to upgrade?");
 +    log_warn(LD_HTTP,
 +             "Too much data received from directory connection (%s): "
 +             "denial of service attempt, or you need to upgrade?",
 +             conn->base_.address);
      connection_mark_for_close(TO_CONN(conn));
      return -1;
    }