diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-05-27 10:35:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-27 10:35:55 -0400 |
| commit | 476714e1a4b18d4beaa8aa6e0c6b8939efbf2f9f (patch) | |
| tree | 6e671695f24a6ff9d02f555626e3046d9a782fb2 | |
| parent | 3934e78bb94a73e9528bd33aa3b2fb952ff810db (diff) | |
| parent | 5a83122961391d4309f46062ff95b121f77bc6d8 (diff) | |
| download | tor-476714e1a4b18d4beaa8aa6e0c6b8939efbf2f9f.tar.gz tor-476714e1a4b18d4beaa8aa6e0c6b8939efbf2f9f.zip | |
Merge remote-tracking branch 'arma/bug18840'
| -rw-r--r-- | changes/bug18840 | 4 | ||||
| -rw-r--r-- | src/or/dirvote.c | 1 |
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 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); |