Merge branch 'bug30316_035' into bug30316_040

Fixes conflicts and also moves bandwidth-file-digest.

diff --cc src/feature/dirauth/dirvote.c
index 29f5d04509366c8d2c9177b25089e3134c264277,af8b3dc2078828d28520e90fe0c50606bd656a7d..755b99bae241e31882f00d0455771917d72b85e2
--- 1/src/feature/dirauth/dirvote.c
--- 2/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,