diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-10-10 22:31:06 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-10-10 22:31:06 -0400 |
| commit | 7ea904cbc0acbe1575ff68700572da76e4e4b10d (patch) | |
| tree | e893c6fd57794cc9b9cacdb414292edd2aa8cb16 /src/or/rendservice.c | |
| parent | 8b36d4cc2ab95acd4c2c7203afb29a051a38c5c9 (diff) | |
| parent | e6d1ab3600c6bbbda7f30093fb7623581a44a325 (diff) | |
| download | tor-7ea904cbc0acbe1575ff68700572da76e4e4b10d.tar.gz tor-7ea904cbc0acbe1575ff68700572da76e4e4b10d.zip | |
Merge branch 'bug7011'
Conflicts:
src/or/circuitbuild.c
The conflict was trivial, since no line of code actually changed in
both branches: There was a fmt_addr() that turned into fmt_addrport()
in bug7011, and a "if (!n_conn)" that turned into "if (!n_chan)" in
master.
Diffstat (limited to 'src/or/rendservice.c')
| -rw-r--r-- | src/or/rendservice.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/rendservice.c b/src/or/rendservice.c index 0fa04b63fe..a1d4ac6f48 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -272,8 +272,8 @@ rend_add_service(rend_service_t *service) service->directory); for (i = 0; i < smartlist_len(service->ports); ++i) { p = smartlist_get(service->ports, i); - log_debug(LD_REND,"Service maps port %d to %s:%d", - p->virtual_port, fmt_addr(&p->real_addr), p->real_port); + log_debug(LD_REND,"Service maps port %d to %s", + p->virtual_port, fmt_addrport(&p->real_addr, p->real_port)); } } } |