Commit 838ec086 authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge remote-tracking branch 'origin/maint-0.2.2'

parents d4de312b 6fd61cf7

changes/bug4856

0 → 100644
+3 −0
Original line number Diff line number Diff line 
  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.

src/or/rendservice.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

  }