Merge remote-tracking branch 'arma/bug18840'

changes/bug18840

@@ -0,0 +1,4 @@
+  o Minor bugfixes:
+    - Authorities now sort the "package" lines in their votes, for ease
+      of debugging. (They are already sorted in the consensus documents.)
+      Fixes bug 18840; bugfix on 0.2.6.3-alpha.

src/or/dirvote.c

@@ -106,6 +106,7 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key,
     SMARTLIST_FOREACH(v3_ns->package_lines, const char *, p,
                       if (validate_recommended_package_line(p))
                         smartlist_add_asprintf(tmp, "package %s\n", p));
+    smartlist_sort_strings(tmp);
     packages = smartlist_join_strings(tmp, "", 0, NULL);
     SMARTLIST_FOREACH(tmp, char *, cp, tor_free(cp));
     smartlist_free(tmp);