sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'maint-0.2.8' into release-0.2.8

This commit is contained in:
Nick Mathewson 2016-08-22 10:19:52 -04:00
parent 6e181bafff 0ba05313d5
commit e085b11d27
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug19947 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (fallback directories):
- Avoid logging a NULL string pointer when loading fallback directory information.
Fixes bug 19947; bugfix on 0.2.4.7-alpha and 0.2.8.1-alpha.
Report and patch by "rubiate".

4
src/or/routerlist.c
View File

@ -4337,10 +4337,10 @@ dir_server_new(int is_authority,
if (nickname)
tor_asprintf(&ent->description, "directory server \"%s\" at %s:%d",
nickname, hostname, (int)dir_port);
nickname, hostname_, (int)dir_port);
else
tor_asprintf(&ent->description, "directory server at %s:%d",
hostname, (int)dir_port);
hostname_, (int)dir_port);
ent->fake_status.addr = ent->addr;
tor_addr_copy(&ent->fake_status.ipv6_addr, &ent->ipv6_addr);