From: Roger Dingledine <arma@torproject.org>
Date: Wed, 11 May 2016 23:04:13 +0000 (-0400)
Subject: Authorities now sort the "package" lines in their votes
X-Git-Tag: tor-0.2.9.1-alpha~204^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a83122961391d4309f46062ff95b121f77bc6d8;p=thirdparty%2Ftor.git

Authorities now sort the "package" lines in their votes

(They are already sorted in the consensus documents)

Fixes bug 18840; bugfix on 0.2.6.3-alpha.
---

diff --git a/changes/bug18840 b/changes/bug18840
new file mode 100644
index 0000000000..b8de1aae88
--- /dev/null
+++ b/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.
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 9854af7d7f..6725a8cacf 100644
--- a/src/or/dirvote.c
+++ b/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);