diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-01-09 12:22:29 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-01-09 12:22:29 -0500 |
| commit | 838ec086beeb83d10e1c50b2027fe7509e153c8c (patch) | |
| tree | 838c5b5ff2a76ab0a6c2d5a3f4ecc02d0ebf110d /src/or | |
| parent | d4de312b3c020c031d550fcd07967283580d3c14 (diff) | |
| parent | 6fd61cf767c0680707e034d9e6a4d46b44bd10af (diff) | |
| download | tor-838ec086beeb83d10e1c50b2027fe7509e153c8c.tar.gz tor-838ec086beeb83d10e1c50b2027fe7509e153c8c.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/rendservice.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 5154f740cb..dcd962d7d5 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -1768,7 +1768,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; } |