0e032fe9ea
fixups from code review
2017-12-21 15:29:33 -05:00
cd8bcacfe1
cargo fmt fixes
2017-12-21 15:29:33 -05:00
3dfe8e6522
add minimal rust module for logging to tor's logger
...
Allows an optional no-op for testing purposes
2017-12-21 15:29:33 -05:00
719db28f54
Add minimal implementations of functions Rust needs for logging
2017-12-21 15:28:29 -05:00
f5d89fab25
Merge branch 'maint-0.3.2'
...
"ours" to avoid version bump.
2017-12-21 14:22:58 -05:00
94c59851df
Increment version to 0.3.2.8-rc-dev
2017-12-21 14:22:54 -05:00
20e9b428c2
forward-port the 0.3.2.8-rc changelog
2017-12-21 14:22:30 -05:00
713a717022
scan-build: Replace some test-assertions with fatal assertions
...
Using tt_assert in these helpers was implying to scan-build that our
'new' functions might be returning NULL, which in turn would make it
warn about null-pointer use.
2017-12-21 13:26:57 -05:00
eb00840ab8
Merge branch 'maint-0.3.2'
...
"ours" merge to avoid version bump.
2017-12-21 12:42:11 -05:00
1a77799665
Increment version to 0.3.2.8-rc
2017-12-21 12:42:00 -05:00
7b9e790956
remove changes files that appear in 0.3.2.8-rc
2017-12-21 12:41:25 -05:00
2b8a06a2ef
Merge branch 'maint-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
2f0d57db56
Fix a compilation error in the channel tests.
...
This would only show up on systems like windows where monotime_t and
monotime_coarse_t are different types.
2017-12-21 11:10:30 -05:00
1eeb505e6f
In 0.3.3, we use timestamps, not absolute milliseconds.
2017-12-21 10:57:45 -05:00
b8a3602b2a
Merge branch 'maint-0.3.2'
2017-12-21 10:54:05 -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
bcc96c77de
Merge branch 'maint-0.3.2'
2017-12-21 10:27:39 -05:00
c38157be9d
clarify a comment
2017-12-21 10:27:37 -05:00
d0c5fe257b
Merge branch 'maint-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
5db94adac2
Fix a pair of memory leaks in tor_cleanup()
...
Spotted by coverity scan as 1426749 and 1426750
Bug not in any released Tor.
2017-12-21 08:50:41 -05:00
bac0bcbba1
type error fix for monotime_coarse_add_msec on windows
2017-12-20 17:45:59 -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
7e45720cf4
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-20 12:15:24 -05:00
0e790bb40d
Merge branch '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
a499be33b8
Merge branch 'maint-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
7ca0a9c4ae
Merge remote-tracking branch 'ahf-oniongit/bugs/24605'
2017-12-20 11:16:17 -05:00
c99ec36def
expand documentation on tor_remove_file
2017-12-20 10:43:27 -05:00
4b7b305bf0
Remove pre-unlink check tor_remove_file; check errno instead.
...
This removes a time-of-check/time-of-use issue, though in this case
it would probably be harmless.
2017-12-20 10:42:02 -05:00
18543c2c9b
Merge remote-tracking branch 'ffmancera/github/bug23271'
2017-12-20 10:40:32 -05:00
3bc5806339
Merge branch 'maint-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
8e5450b752
Remove merge-conflict detritus
2017-12-20 10:15:00 -05:00
f92b533757
Merge remote-tracking branch 'teor/ticket24682'
2017-12-20 10:14:43 -05:00
83ced3e7fe
Merge branch 'maint-0.3.2'
2017-12-20 09:59:51 -05:00
Chelsea Holland Komlo
Nick Mathewson
David Goulet
Karsten Loesing