Merge remote-tracking branch 'public/bug12728_024'

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.

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))