aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-01-09 12:21:04 -0500
committerNick Mathewson <nickm@torproject.org>2012-01-09 12:21:04 -0500
commit6fd61cf767c0680707e034d9e6a4d46b44bd10af (patch)
tree98ec67d837239681e00476eade462ec33a47c6a2
parentcc1580dbe02f0f285fca65b7b388d99dbaf78f5c (diff)
downloadtor-6fd61cf767c0680707e034d9e6a4d46b44bd10af.tar
tor-6fd61cf767c0680707e034d9e6a4d46b44bd10af.tar.gz
Fix a trivial log message error in renservice.c
Fixes bug 4856; bugfix on 0.0.6 This bug was introduced in 79fc5217, back in 2004.
-rw-r--r--changes/bug48563
-rw-r--r--src/or/rendservice.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/changes/bug4856 b/changes/bug4856
new file mode 100644
index 000000000..fa284a09f
--- /dev/null
+++ b/changes/bug4856
@@ -0,0 +1,3 @@
+ o Trivial bugfixes
+ - Fix a typo in a log message in rend_service_rendezvous_has_opened().
+ Fixes bug 4856; bugfix on Tor 0.0.6.
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 25695c5e6..bb3aacd92 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1564,7 +1564,7 @@ rend_service_rendezvous_has_opened(origin_circuit_t *circuit)
circuit->rend_data->rend_pk_digest);
if (!service) {
log_warn(LD_GENERAL, "Internal error: unrecognized service ID on "
- "introduction circuit.");
+ "rendezvous circuit.");
reason = END_CIRC_REASON_INTERNAL;
goto err;
}