nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-14 07:03:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'public/bug12728_024'

Browse Source
This commit is contained in:
Nick Mathewson 2014-08-20 12:44:15 -04:00
commit d0009cb8e8
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug12728 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- When generating our family list, remove spaces from around the
entries there. Fixes bug 12728; bugfix on 0.2.1.7-alpha.

2
src/or/router.c
View File

@ -1879,7 +1879,7 @@ router_rebuild_descriptor(int force)
family = smartlist_new(); family = smartlist_new();
ri->declared_family = smartlist_new(); ri->declared_family = smartlist_new();
smartlist_split_string(family, options->MyFamily, ",", smartlist_split_string(family, options->MyFamily, ",",
SPLIT_SKIP_SPACE|SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0); SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK|SPLIT_STRIP_SPACE, 0);
SMARTLIST_FOREACH_BEGIN(family, char *, name) { SMARTLIST_FOREACH_BEGIN(family, char *, name) {
const node_t *member; const node_t *member;
if (!strcasecmp(name, options->Nickname)) if (!strcasecmp(name, options->Nickname))