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

The conflicts were mainly caused by the routerinfo->node transition.

Conflicts:
	src/or/circuitbuild.c
	src/or/command.c
	src/or/connection_edge.c
	src/or/directory.c
	src/or/dirserv.c
	src/or/relay.c
	src/or/rendservice.c
	src/or/routerlist.c

1 files changed, 4 insertions, 3 deletions

diff --git a/src/or/directory.c b/src/or/directory.c
index 810612cd69..e7a2a4b834 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -558,7 +558,8 @@ directory_initiate_command_routerstatus_rend(const routerstatus_t *status,
 
   if (!node && anonymized_connection) {
     log_info(LD_DIR, "Not sending anonymized request to directory '%s'; we "
-                     "don't have its router descriptor.", status->nickname);
+             "don't have its router descriptor.",
+             routerstatus_describe(status));
     return;
   } else if (node) {
     node_get_address_string(node, address_buf, sizeof(address_buf));
@@ -572,10 +573,10 @@ directory_initiate_command_routerstatus_rend(const routerstatus_t *status,
 
   if (options->ExcludeNodes && options->StrictNodes &&
       routerset_contains_routerstatus(options->ExcludeNodes, status, -1)) {
-    log_warn(LD_DIR, "Wanted to contact directory mirror '%s' for %s, but "
+    log_warn(LD_DIR, "Wanted to contact directory mirror %s for %s, but "
              "it's in our ExcludedNodes list and StrictNodes is set. "
              "Skipping. This choice might make your Tor not work.",
-             status->nickname,
+             routerstatus_describe(status),
              dir_conn_purpose_to_string(dir_purpose));
     return;
   }