summaryrefslogtreecommitdiff
path: root/src/or/dirvote.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2016-05-27 10:35:55 -0400
committerNick Mathewson <nickm@torproject.org>2016-05-27 10:35:55 -0400
commit476714e1a4b18d4beaa8aa6e0c6b8939efbf2f9f (patch)
tree6e671695f24a6ff9d02f555626e3046d9a782fb2 /src/or/dirvote.c
parent3934e78bb94a73e9528bd33aa3b2fb952ff810db (diff)
parent5a83122961391d4309f46062ff95b121f77bc6d8 (diff)
downloadtor-476714e1a4b18d4beaa8aa6e0c6b8939efbf2f9f.tar.gz
tor-476714e1a4b18d4beaa8aa6e0c6b8939efbf2f9f.zip
Merge remote-tracking branch 'arma/bug18840'
Diffstat (limited to 'src/or/dirvote.c')
-rw-r--r--src/or/dirvote.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index 6a02fca69e..a94ff8b451 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);