sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

This commit is contained in:
Nick Mathewson 2018-04-03 19:19:02 -04:00
parent 21c81348a3 2680a8b5b1
commit 218b1746ba
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket25645 Normal file
View File

@ -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

4
src/or/channel.c
View File

@ -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;