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/dirserv.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/dirserv.c')
| -rw-r--r-- | src/or/dirserv.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 1480cb60dd..ac7b122e68 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -2118,11 +2118,9 @@ routerstatus_format_entry(char *buf, size_t buf_len, /* Possible "a" line. At most one for now. */ if (!tor_addr_is_null(&rs->ipv6_addr)) { - const char *addr_str = fmt_and_decorate_addr(&rs->ipv6_addr); r = tor_snprintf(cp, buf_len - (cp-buf), - "a %s:%d\n", - addr_str, - (int)rs->ipv6_orport); + "a %s\n", + fmt_addrport(&rs->ipv6_addr, rs->ipv6_orport)); if (r<0) { log_warn(LD_BUG, "Not enough space in buffer."); return -1; |