nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 05:33:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.4'

Browse Source
This commit is contained in:
Nick Mathewson 2013-07-16 14:49:41 -04:00
commit f797ac465f
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug9254 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes:
- Fix a spurious compilation warning with some older versions of
GCC on FreeBSD. Fixes bug 9254; bugfix on 0.2.4.14-alpha.

6
src/or/circuitlist.c
View File

@ -1642,8 +1642,10 @@ static size_t
n_cells_in_circ_queues(const circuit_t *c)
{
size_t n = c->n_chan_cells.n;
if (! CIRCUIT_IS_ORIGIN(c))
n += TO_OR_CIRCUIT((circuit_t*)c)->p_chan_cells.n;
if (! CIRCUIT_IS_ORIGIN(c)) {
circuit_t *cc = (circuit_t *) c;
n += TO_OR_CIRCUIT(cc)->p_chan_cells.n;
}
return n;
}