From: Nick Mathewson <nickm@torproject.org>
Date: Mon, 29 Apr 2019 17:48:25 +0000 (-0400)
Subject: Merge branch 'bug30316_035' into bug30316_040
X-Git-Tag: tor-0.4.1.2-alpha~35^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=821dd54586bffd95bdd8c9d333b1f80ef55d3742;p=thirdparty%2Ftor.git

Merge branch 'bug30316_035' into bug30316_040

Fixes conflicts and also moves bandwidth-file-digest.
---

821dd54586bffd95bdd8c9d333b1f80ef55d3742
diff --cc src/feature/dirauth/dirvote.c
index 29f5d04509,af8b3dc207..755b99bae2
--- 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,