tor

commit 218b1746baea65c06551f7e2736d382e6a01a49d
parent 21c81348a39dd235c40656c34abb76daf88e81f3
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  3 Apr 2018 19:19:02 -0400

Merge remote-tracking branch 'fristonio/ticket-25645'

Diffstat:
A
changes/ticket25645
 | 
4
++++
M
src/or/channel.c
 | 
4
+---

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/changes/ticket25645 b/changes/ticket25645
@@ -0,0 +1,4 @@
+  o Minor bugfixes (channel_get_for_extend()):
+    - Remove the unused variable n_possible from the function
+      Fixes bug 25645; bugfix on 0.2.4.4-alpha
+
diff --git a/src/or/channel.c b/src/or/channel.c
@@ -2387,7 +2387,7 @@ channel_get_for_extend(const char *rsa_id_digest,
 {
   channel_t *chan, *best = NULL;
   int n_inprogress_goodaddr = 0, n_old = 0;
-  int n_noncanonical = 0, n_possible = 0;
+  int n_noncanonical = 0;
 
   tor_assert(msg_out);
   tor_assert(launch_out);
@@ -2450,8 +2450,6 @@ channel_get_for_extend(const char *rsa_id_digest,
       continue;
     }
 
-    ++n_possible;
-
     if (!best) {
       best = chan; /* If we have no 'best' so far, this one is good enough. */
       continue;