commit 821dd54586bffd95bdd8c9d333b1f80ef55d3742 Merge: 593d29920 0ab4dc7ef Author: Nick Mathewson <nickm@torproject.org> Date: Mon Apr 29 13:48:25 2019 -0400 Merge branch 'bug30316_035' into bug30316_040 Fixes conflicts and also moves bandwidth-file-digest. changes/bug30316 | 4 ++++ src/feature/dirauth/dirvote.c | 11 +++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --cc src/feature/dirauth/dirvote.c index 29f5d0450,af8b3dc20..755b99bae --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@@ -348,6 -322,7 +348,8 @@@ format_networkstatus_vote(crypto_pk_t * "known-flags %s\n" "flag-thresholds %s\n" "params %s\n" + "%s" /* bandwidth file headers */ ++ "%s" /* bandwidth file digest */ "dir-source %s %s %s %s %d %d\n" "contact %s\n" "%s" /* shared randomness information */ @@@ -365,6 -338,7 +365,8 @@@ flags, flag_thresholds, params, + bw_headers_line ? bw_headers_line : "", ++ bw_file_digest ? bw_file_digest: "", voter->nickname, fingerprint, voter->address, fmt_addr32(addr), voter->dir_port, voter->or_port, voter->contact,