diff options
author | Nick Mathewson <nickm@torproject.org> | 2016-05-11 13:13:23 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2016-05-11 13:13:23 -0400 |
commit | 4e94580591da579e53461aeedfb1340836427c02 (patch) | |
tree | 99e285a1405f144fc7e52a69e4f5b2d7f7ce011a /src/or/dirserv.h | |
parent | 039fc8427a512efce87b7bd21c10c4adca4ba30d (diff) | |
parent | bf3e32a45288b64e5535e02f40bd2bcb93c8a520 (diff) | |
download | tor-4e94580591da579e53461aeedfb1340836427c02.tar.gz tor-4e94580591da579e53461aeedfb1340836427c02.zip |
Merge remote-tracking branch 'special/bug19032-027' into maint-0.2.7
Diffstat (limited to 'src/or/dirserv.h')
-rw-r--r-- | src/or/dirserv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/dirserv.h b/src/or/dirserv.h index b16a67c081..4bb307217d 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -50,7 +50,7 @@ int list_server_status_v1(smartlist_t *routers, char **router_status_out, int dirserv_dump_directory_to_string(char **dir_out, crypto_pk_t *private_key); char *dirserv_get_flag_thresholds_line(void); -void dirserv_compute_bridge_flag_thresholds(const smartlist_t *routers); +void dirserv_compute_bridge_flag_thresholds(void); int directory_fetches_from_authorities(const or_options_t *options); int directory_fetches_dir_info_early(const or_options_t *options); |