Commit 322c1ed8 authored by David Goulet's avatar David Goulet 🐼
Browse files

Merge branch 'maint-0.4.7' into release-0.4.7

parents 0b38e2e7 36612b9b
Loading
Loading
Loading
Loading

changes/ticket40753

0 → 100644
+5 −0
Original line number Diff line number Diff line
  o Minor features (directory authorities):
    - Directory authorities now include their AuthDirMaxServersPerAddr
      config option in the consensus parameter section of their vote. Now
      external tools can better predict how they will behave. Implements
      ticket 40753.
+8 −0
Original line number Diff line number Diff line
@@ -4878,6 +4878,14 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key,
      smartlist_split_string(v3_out->net_params,
                             paramline->value, NULL, 0, 0);
    }

    /* for transparency and visibility, include our current value of
     * AuthDirMaxServersPerAddr in our consensus params. Once enough dir
     * auths do this, external tools should be able to use that value to
     * help understand which relays are allowed into the consensus. */
    smartlist_add_asprintf(v3_out->net_params, "AuthDirMaxServersPerAddr=%d",
                           d_options->AuthDirMaxServersPerAddr);

    smartlist_sort_strings(v3_out->net_params);
  }
  v3_out->bw_file_headers = bw_file_headers;