Merge branch 'maint-0.4.8'

diff --cc src/core/or/command.c
Simple merge

diff --cc src/core/or/relay.c
index f116cb59722c47355cc9ba3698baf3fb502e7afc,a6321f180fe91c6e993c6059e0d2716a906c18c8..84dfe00157632a77d537a92401e15b0c7f9d81af
--- 1/src/core/or/relay.c
--- 2/src/core/or/relay.c
+++ b/src/core/or/relay.c
@@@ -292,13 -284,12 +296,12 @@@ circuit_receive_relay_cell(cell_t *cell
          log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,
                 "connection_edge_process_relay_cell (away from origin) "
                 "failed.");
-         return reason;
+         goto error;
        }
-     }
-     if (cell_direction == CELL_DIRECTION_IN) {
+     } else if (cell_direction == CELL_DIRECTION_IN) {
        ++stats_n_relay_cells_delivered;
        log_debug(LD_OR,"Sending to origin.");
 -      reason = connection_edge_process_relay_cell(cell, circ, conn,
 +      reason = connection_edge_process_relay_cell(msg, circ, conn,
                                                    layer_hint);
        if (reason < 0) {
          /* If a client is trying to connect to unknown hidden service port,