From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 12 May 2011 04:14:44 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/maint-0.2.2'
X-Git-Tag: tor-0.2.3.2-alpha~133
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3968e8d14b7f6282963223b0fd4f4ca3afb60c61;p=thirdparty%2Ftor.git

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

3968e8d14b7f6282963223b0fd4f4ca3afb60c61
diff --cc src/or/directory.c
index 313c6c5a40,8c6581a123..2821619ce7
--- 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);