Merge branch 'maint-0.2.7' into maint-0.2.8

This commit is contained in:
Roger Dingledine 2016-05-11 13:42:40 -04:00
commit 163cee1b64

View File

@ -1599,9 +1599,8 @@ dirserv_compute_performance_thresholds(digestmap_t *omit_as_sybil)
* networkstatus_getinfo_by_purpose().
*/
void
dirserv_compute_bridge_flag_thresholds()
dirserv_compute_bridge_flag_thresholds(void)
{
digestmap_t *omit_as_sybil = digestmap_new();
dirserv_compute_performance_thresholds(omit_as_sybil);
digestmap_free(omit_as_sybil, NULL);