summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2016-05-11 19:04:13 -0400
committerRoger Dingledine <arma@torproject.org>2016-05-11 19:04:13 -0400
commit5a83122961391d4309f46062ff95b121f77bc6d8 (patch)
tree1c0dbc0ee8f9823c16b5503e9b5d750fe4009d86
parent9e44273a4a22803eff900f6df10f13c7548bdb0d (diff)
downloadtor-5a83122961391d4309f46062ff95b121f77bc6d8.tar.gz
tor-5a83122961391d4309f46062ff95b121f77bc6d8.zip
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.
-rw-r--r--changes/bug188404
-rw-r--r--src/or/dirvote.c1
2 files changed, 5 insertions, 0 deletions
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);