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

diff --cc src/or/directory.c
index 313c6c5a402bc810f8f22329fafdeee5a1e44e04,8c6581a12336adc404852c53cbd30effe2f3154c..2821619ce72eb80641f5be29014c571cbeab2968
--- 1/src/or/directory.c
--- 2/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);