prefer calling it a client rather than an OP

svn:r8334

4 files changed, 7 insertions, 7 deletions

diff --git a/src/or/command.c b/src/or/command.c
index f508ab2545..cfd915a923 100644
--- a/src/or/command.c
+++ b/src/or/command.c
@@ -266,7 +266,7 @@ command_process_created_cell(cell_t *cell, or_connection_t *conn)
 
   if (circ->n_circ_id != cell->circ_id) {
     log_fn(LOG_PROTOCOL_WARN,LD_PROTOCOL,
-           "got created cell from OPward? Closing.");
+           "got created cell from Tor client? Closing.");
     circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL);
     return;
   }
diff --git a/src/or/relay.c b/src/or/relay.c
index 666cd891a1..a856ebeafe 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -286,14 +286,14 @@ relay_crypt(circuit_t *circ, cell_t *cell, int cell_direction,
 
         thishop = thishop->next;
       } while (thishop != cpath && thishop->state == CPATH_STATE_OPEN);
-      log_warn(LD_OR,"in-cell at OP not recognized. Closing.");
+      log_warn(LD_OR,"in-cell at client not recognized. Closing.");
       return -1;
     } else { /* we're in the middle. Just one crypt. */
       if (relay_crypt_one_payload(TO_OR_CIRCUIT(circ)->p_crypto,
                                   cell->payload, 1) < 0)
         return -1;
 //      log_fn(LOG_DEBUG,"Skipping recognized check, because we're not "
-//             "the OP.");
+//             "the client.");
     }
   } else /* cell_direction == CELL_DIRECTION_OUT */ {
     /* we're in the middle. Just one crypt. */
@@ -639,8 +639,8 @@ errno_to_end_reason(int e)
     E_CASE(EMFILE):
       return END_STREAM_REASON_RESOURCELIMIT;
     default:
-      log_info(LD_EXIT, "Didn't recognize errno %d (%s); telling the OP that "
-               "we are ending a stream for 'misc' reason.",
+      log_info(LD_EXIT, "Didn't recognize errno %d (%s); telling the client "
+               "that we are ending a stream for 'misc' reason.",
                e, tor_socket_strerror(e));
       return END_STREAM_REASON_MISC;
   }
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 5ecd2af935..e96d608d59 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -300,7 +300,7 @@ rend_mid_rendezvous(or_circuit_t *circ, const char *request,
                                    request+REND_COOKIE_LEN,
                                    request_len-REND_COOKIE_LEN, NULL)) {
     log_warn(LD_GENERAL,
-             "Unable to send RENDEZVOUS2 cell to OP on circuit %d.",
+             "Unable to send RENDEZVOUS2 cell to client on circuit %d.",
              rend_circ->p_circ_id);
     goto err;
   }
diff --git a/src/or/router.c b/src/or/router.c
index 63262c483c..fb8f8904ef 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -264,7 +264,7 @@ init_keys(void)
     if (tor_tls_context_new(get_identity_key(),
                             options->Nickname ? options->Nickname : "client",
                             MAX_SSL_KEY_LIFETIME) < 0) {
-      log_err(LD_GENERAL,"Error creating TLS context for OP.");
+      log_err(LD_GENERAL,"Error creating TLS context for Tor client.");
       return -1;
     }
     return 0;