63b84335dc
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-21 12:42:22 -05:00
1a77799665
Increment version to 0.3.2.8-rc
2017-12-21 12:42:00 -05:00
afacaa02a5
reflow the changelog
2017-12-21 12:40:32 -05:00
9be4b91760
start an 0.3.2.8 changelog
2017-12-21 12:40:11 -05:00
0d1a2e366a
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-21 11:16:00 -05:00
6cd567d797
Merge remote-tracking branch 'dgoulet/bug24671_032_01' into maint-0.3.2
2017-12-21 11:13:33 -05:00
29e23e62c9
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-21 10:58:20 -05:00
84adb9fcca
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-21 10:50:33 -05:00
08469a338a
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-21 10:50:06 -05:00
03b4dd92a4
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-21 10:49:40 -05:00
79a50afa0e
Use monotime_coarse_absolute_msec() in destroy queue
...
This way it will match the insert queue in 029 and later.
2017-12-21 10:48:37 -05:00
3b08184338
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-21 10:43:12 -05:00
7d845976e3
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-21 10:43:06 -05:00
9202087760
Merge branch 'bug24666_squashed_025' into maint-0.2.5
2017-12-21 10:40:10 -05:00
cd1f708a7f
Move free to end of test function so coverity won't complain.
2017-12-21 10:39:29 -05:00
520cf21793
Move destroy cells into a separate queue type of their own, to save RAM
...
We've been seeing problems with destroy cells queues taking up a
huge amount of RAM. We can mitigate this, since while a full packed
destroy cell takes 514 bytes, we only need 5 bytes to remember a
circuit ID and a reason.
Fixes bug 24666. Bugfix on 0.2.5.1-alpha, when destroy cell queues
were introduced.
2017-12-21 10:29:01 -05:00
88642bbdc7
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-21 10:27:39 -05:00
c38157be9d
clarify a comment
2017-12-21 10:27:37 -05:00
2a7cad9572
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-21 10:20:35 -05:00
885ba513ff
sched: Consider extra_space even if negative in KIST
...
With extra_space negative, it means that the "notsent" queue is quite large so
we must consider that value with the current computed tcp_space. If we end up
to have negative space, we should not add more data to the kernel since the
notsent queue is just too filled up.
Fixes #24665
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-12-21 09:32:04 -05:00
fdfa4a5a14
sched: Use lower layer cell limit with KISTLite
...
Instead of using INT_MAX as a write limit for KISTLite, use the lower layer
limit which is using the specialized num_cells_writeable() of the channel that
will down the line check the connection's outbuf and limit it to 32KB
(OR_CONN_HIGHWATER).
That way we don't take the chance of bloating the connection's outbuf and we
keep the cells in the circuit queue which our OOM handler can take care of,
not the outbuf.
Finally, this commit adds a log_debug() in the update socket information
function of KIST so we can get the socket information in debug.
Fixes #24671
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-12-20 14:17:18 -05:00
5e92646715
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-20 12:15:24 -05:00
08ed0d7930
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-20 12:15:24 -05:00
c2b64ad096
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-20 12:15:24 -05:00
7e45720cf4
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-20 12:15:24 -05:00
c604a76a53
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-20 12:15:23 -05:00
877dd1d6c8
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-20 12:15:23 -05:00
428f8a375b
Update geoip and geoip6 to the December 6 2017 database.
2017-12-20 17:36:29 +01:00
748f0abc2d
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-20 11:19:23 -05:00
565ec6100f
Merge branch 'stack_again_032' into maint-0.3.2
2017-12-20 11:19:18 -05:00
2824413f40
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-20 10:39:38 -05:00
0a1b1430c8
Update the unit tests to reflect the change of 24425
2017-12-20 10:39:19 -05:00
64c88c7199
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-20 09:59:51 -05:00
fc33caadae
Merge remote-tracking branch 'dgoulet/ticket24425_032_01' into maint-0.3.2
2017-12-20 09:59:06 -05:00
4f8a0ed62d
Partial revert of 2b48b5363f -- didn't mean to commit this
...
yet
2017-12-14 15:44:56 -05:00
0f105d69fc
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-14 14:12:49 -05:00
5c4da2cacd
bump to 0.3.2.7-rc-dev
2017-12-14 14:12:31 -05:00
2b48b5363f
whoops, pick a date
2017-12-14 14:05:51 -05:00
304e2151ac
edit changelog a bit
2017-12-13 12:17:34 -05:00
6ff333f627
Start on an 0.3.2.7-rc changelog
2017-12-13 12:11:17 -05:00
0834f4d93d
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-13 12:07:46 -05:00
ca8e9813bf
vim sometimes makes swo tempfiles
2017-12-13 12:07:45 -05:00
4c015d9fe4
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-13 12:06:52 -05:00
93b3c4b844
update to 0.3.2.7-rc
2017-12-13 12:06:37 -05:00
f7e393eb4c
Another attempt at fixing the STACK warning in tortls.c
...
Patch suggestion from catalyst.
Related to 24423
2017-12-13 10:09:10 -05:00
37fba82c15
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-12 19:46:53 -05:00
15b41fa6ae
Make sandbox.c compile when libseccomp-dev is installed on arm64
...
Fixes ticket 24424. Patch from weasel.
2017-12-12 19:46:03 -05:00
dc9f2cdf73
Merge branch 'maint-0.3.2' into release-0.3.2
2017-12-12 19:27:14 -05:00
bf89b08930
Merge branch 'bug24367_032_squashed' into maint-0.3.2
2017-12-12 19:17:38 -05:00
19a4abf2a9
Make sure bridges are definitely running before delaying directory fetches
...
Retry directory downloads when we get our first bridge descriptor
during bootstrap or while reconnecting to the network. Keep retrying
every time we get a bridge descriptor, until we have a reachable bridge.
Stop delaying bridge descriptor fetches when we have cached bridge
descriptors. Instead, only delay bridge descriptor fetches when we
have at least one reachable bridge.
Fixes bug 24367; bugfix on 0.2.0.3-alpha.
2017-12-12 19:17:25 -05:00
Nick Mathewson
David Goulet
Karsten Loesing
teor