summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2007-07-30 01:32:07 +0000
committerNick Mathewson <nickm@torproject.org>2007-07-30 01:32:07 +0000
commita3b8b2c4e362d74e56356faf9889c64b92e9eabc (patch)
tree8a71438752ac2774ce6e336fd988aae0a2555541
parent468d9222802955ad65e0e3b49d240e9581e75351 (diff)
downloadtor-a3b8b2c4e362d74e56356faf9889c64b92e9eabc.tar.gz
tor-a3b8b2c4e362d74e56356faf9889c64b92e9eabc.zip
r14000@catbus: nickm | 2007-07-29 21:16:45 -0400
Fix bug 472: do not use spaces in pseudo-address for local link cons. svn:r10979
-rw-r--r--ChangeLog2
-rw-r--r--src/or/connection_edge.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f989efb033..4834641c5d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -108,6 +108,8 @@ Changes in version 0.2.0.3-alpha - 2007-07-29
- Use CRLF line endings properly in NS events.
- Terminate multi-line control events properly. (Original patch from tup.)
[Bugfix on 0.1.2.x-alpha]
+ - Do not include spaces in SOURCE_ADDR fields in STREAM events. Resolves
+ bug 472. [Bugfix on 0.2.0.x-alpha]
o Minor bugfixes (misc):
- Choose perfectly fairly among routers when choosing by bandwidth and
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index f310d9289b..efea1464bf 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -1962,7 +1962,7 @@ connection_ap_make_link(char *address, uint16_t port,
digest, DIGEST_LEN);
}
- conn->_base.address = tor_strdup("(local link)");
+ conn->_base.address = tor_strdup("(Tor_internal)");
conn->_base.addr = 0;
conn->_base.port = 0;