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

src/or/command.c

@@ -276,8 +276,8 @@ command_process_create_cell(cell_t *cell, or_connection_t *conn)
     if (node) {
       char *p = esc_for_log(node_get_platform(node));
       log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
-             "Details: nickname \"%s\", platform %s.",
-             node_get_nickname(node), p);
+             "Details: router %s, platform %s.",
+             node_describe(node), p);
       tor_free(p);
     }
     return;