[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug10543_024_v2'

[nickm at torproject.org]

commit 075482ff8091fb920dc00cd122482828d08ac3c8
Merge: 2d41cab dffac25
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 6 16:25:26 2014 -0500

    Merge remote-tracking branch 'public/bug10543_024_v2'

 changes/bug10543  |    5 +++++
 src/or/nodelist.c |   25 ++++++++++++++++++++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --cc src/or/nodelist.c
index d1a226e,8fa1703..395ea33
--- 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);