summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-12-21Merge branch 'maint-0.3.2' into release-0.3.2tor-0.3.2.8-rcNick Mathewson
2017-12-21Increment version to 0.3.2.8-rcNick Mathewson
2017-12-21reflow the changelogNick Mathewson
2017-12-21start an 0.3.2.8 changelogNick Mathewson
2017-12-21Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-21Merge remote-tracking branch 'dgoulet/bug24671_032_01' into maint-0.3.2Nick Mathewson
2017-12-21Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-21Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-12-21Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-12-21Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-12-21Use monotime_coarse_absolute_msec() in destroy queueNick Mathewson
This way it will match the insert queue in 029 and later.
2017-12-21Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-12-21Merge branch 'maint-0.2.5' into maint-0.2.8maint-0.2.8Nick Mathewson
2017-12-21Merge branch 'bug24666_squashed_025' into maint-0.2.5Nick Mathewson
2017-12-21Move free to end of test function so coverity won't complain.Nick Mathewson
2017-12-21Move destroy cells into a separate queue type of their own, to save RAMNick Mathewson
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-21Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-21clarify a commentNick Mathewson
2017-12-21Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-21sched: Consider extra_space even if negative in KISTDavid Goulet
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-20sched: Use lower layer cell limit with KISTLiteDavid Goulet
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-20Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-12-20Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-12-20Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-20Merge branch 'maint-0.3.1' into maint-0.3.2Nick Mathewson
2017-12-20Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-12-20Merge branch 'maint-0.2.5' into maint-0.2.8Nick Mathewson
2017-12-20Update geoip and geoip6 to the December 6 2017 database.Karsten Loesing
2017-12-20Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-20Merge branch 'stack_again_032' into maint-0.3.2Nick Mathewson
2017-12-20Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-20Update the unit tests to reflect the change of 24425Nick Mathewson
2017-12-20Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-20Merge remote-tracking branch 'dgoulet/ticket24425_032_01' into maint-0.3.2Nick Mathewson
2017-12-14Partial revert of 2b48b5363f9aa5bd1 -- didn't mean to commit thisNick Mathewson
yet
2017-12-14Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-14bump to 0.3.2.7-rc-devNick Mathewson
2017-12-14whoops, pick a dateNick Mathewson
2017-12-13edit changelog a bittor-0.3.2.7-rcNick Mathewson
2017-12-13Start on an 0.3.2.7-rc changelogNick Mathewson
2017-12-13Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-13vim sometimes makes swo tempfilesNick Mathewson
2017-12-13Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-13update to 0.3.2.7-rcNick Mathewson
2017-12-13Another attempt at fixing the STACK warning in tortls.cNick Mathewson
Patch suggestion from catalyst. Related to 24423
2017-12-12Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-12Make sandbox.c compile when libseccomp-dev is installed on arm64Nick Mathewson
Fixes ticket 24424. Patch from weasel.
2017-12-12Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2017-12-12Merge branch 'bug24367_032_squashed' into maint-0.3.2Nick Mathewson
2017-12-12Make sure bridges are definitely running before delaying directory fetchesteor
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.