From: Nick Mathewson Date: Thu, 6 Feb 2014 21:25:26 +0000 (-0500) Subject: Merge remote-tracking branch 'public/bug10543_024_v2' X-Git-Tag: tor-0.2.5.2-alpha~23 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=075482ff8091fb920dc00cd122482828d08ac3c8;p=thirdparty%2Ftor.git Merge remote-tracking branch 'public/bug10543_024_v2' --- 075482ff8091fb920dc00cd122482828d08ac3c8 diff --cc src/or/nodelist.c index d1a226e4ff,8fa1703325..395ea3346a --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@@ -1331,9 -1329,10 +1331,10 @@@ compute_frac_paths_available(const netw smartlist_t *mid = smartlist_new(); smartlist_t *exits = smartlist_new(); smartlist_t *myexits= smartlist_new(); - double f_guard, f_mid, f_exit, f_myexit; + smartlist_t *myexits_unflagged = smartlist_new(); + double f_guard, f_mid, f_exit, f_myexit, f_myexit_unflagged; int np, nu; /* Ignored */ - const int authdir = authdir_mode_v2(options) || authdir_mode_v3(options); + const int authdir = authdir_mode_v3(options); count_usable_descriptors(num_present_out, num_usable_out, mid, consensus, options, now, NULL, 0);