diff options
| author | Nick Mathewson <nickm@torproject.org> | 2014-08-20 12:44:15 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2014-08-20 12:44:15 -0400 |
| commit | d0009cb8e8bd2a6f1c84f9f117a71f84045fdfce (patch) | |
| tree | 3817a5085f19ce2726a78f99158672c708e83ce5 | |
| parent | d28670c94fb6482cfbd5117b001f076dbb9b9f41 (diff) | |
| parent | 04007448b9f318f4c3517ce173272f756a02f28c (diff) | |
| download | tor-d0009cb8e8bd2a6f1c84f9f117a71f84045fdfce.tar.gz tor-d0009cb8e8bd2a6f1c84f9f117a71f84045fdfce.zip | |
Merge remote-tracking branch 'public/bug12728_024'
| -rw-r--r-- | changes/bug12728 | 4 | ||||
| -rw-r--r-- | src/or/router.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug12728 b/changes/bug12728 new file mode 100644 index 0000000000..ee392457b4 --- /dev/null +++ b/changes/bug12728 @@ -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. diff --git a/src/or/router.c b/src/or/router.c index 4fcd4a5b89..87b6705d84 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1879,7 +1879,7 @@ router_rebuild_descriptor(int force) family = smartlist_new(); ri->declared_family = smartlist_new(); 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) { const node_t *member; if (!strcasecmp(name, options->Nickname)) |