[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 3968e8d14b7f6282963223b0fd4f4ca3afb60c61
Merge: 7649adb b47f574
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 12 00:14:44 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'

 changes/bug1352    |    4 ++++
 src/or/directory.c |   24 +++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --cc src/or/directory.c
index 313c6c5,8c6581a..2821619
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@@ -650,11 -617,10 +650,11 @@@ connection_dir_request_failed(dir_conne
    if (conn->_base.purpose == DIR_PURPOSE_FETCH_V2_NETWORKSTATUS) {
      log_info(LD_DIR, "Giving up on directory server at '%s'; retrying",
               conn->_base.address);
-     connection_dir_download_networkstatus_failed(conn, -1);
+     connection_dir_download_v2_networkstatus_failed(conn, -1);
    } else if (conn->_base.purpose == DIR_PURPOSE_FETCH_SERVERDESC ||
               conn->_base.purpose == DIR_PURPOSE_FETCH_EXTRAINFO) {
 -    log_info(LD_DIR, "Giving up on directory server at '%s'; retrying",
 +    log_info(LD_DIR, "Giving up on serverdesc/extrainfo fetch from "
 +             "directory server at '%s'; retrying",
               conn->_base.address);
      if (conn->router_purpose == ROUTER_PURPOSE_BRIDGE)
        connection_dir_bridge_routerdesc_failed(conn);