Nick Mathewson
eecfed0cd2
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-11 16:56:31 -05:00
Nick Mathewson
f7151387d9
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-11 16:56:31 -05:00
Nick Mathewson
cdee62da9e
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-11 16:56:31 -05:00
Nick Mathewson
4593f5a6e1
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:56:31 -05:00
Nick Mathewson
da38904efb
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:56:31 -05:00
Nick Mathewson
a6587e9070
Merge branch 'maint-0.3.2'
2017-12-11 16:56:31 -05:00
Nick Mathewson
1deda2106b
Merge branch 'bug24167_025' into maint-0.2.5
2017-12-11 16:56:28 -05:00
Nick Mathewson
43fb8fc5cb
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:54:14 -05:00
Nick Mathewson
422ff8f922
Merge branch 'maint-0.3.2'
2017-12-11 16:54:14 -05:00
Nick Mathewson
eaaa1108a3
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-11 16:54:14 -05:00
Nick Mathewson
04524443d0
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-11 16:54:14 -05:00
Nick Mathewson
2ea573ece8
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:54:14 -05:00
Nick Mathewson
bc1ea4f470
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-11 16:54:11 -05:00
Nick Mathewson
f5d4bdf305
Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5
2017-12-11 16:53:02 -05:00
Nick Mathewson
e553bf3ce4
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:51:58 -05:00
Nick Mathewson
16ec4da68c
Merge branch 'maint-0.3.2'
2017-12-11 16:51:58 -05:00
Nick Mathewson
736e7299ce
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-11 16:51:58 -05:00
Nick Mathewson
7fcb222ab7
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:51:58 -05:00
Nick Mathewson
7e486dd6f7
Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9
2017-12-11 16:51:54 -05:00
Nick Mathewson
bfc9be4c77
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:50:48 -05:00
Nick Mathewson
abcc7032ce
Merge branch 'maint-0.3.2'
2017-12-11 16:50:48 -05:00
Nick Mathewson
f7b41bcdf0
Merge branch 'bug24086_031' into maint-0.3.1
2017-12-11 16:49:01 -05:00
Nick Mathewson
828333e38c
Merge remote-tracking branch 'public/bug24099_031' into maint-0.3.1
2017-12-11 16:48:44 -05:00
Nick Mathewson
dc79d5299d
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:46:00 -05:00
Nick Mathewson
3b2f4d1391
Merge branch 'maint-0.3.2'
2017-12-11 16:46:00 -05:00
Nick Mathewson
d2031f2c60
Merge remote-tracking branch 'public/bug23817_031' into maint-0.3.1
2017-12-11 16:45:54 -05:00
Nick Mathewson
d5400d50e7
Merge branch 'maint-0.3.2'
2017-12-11 16:43:51 -05:00
Nick Mathewson
acc462c965
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:43:48 -05:00
Nick Mathewson
ae608408e9
Merge remote-tracking branch 'asn/bug23862_031' into maint-0.3.1
2017-12-11 16:43:41 -05:00
Nick Mathewson
8e100d1a17
Merge branch 'maint-0.3.0' into maint-0.3.1
...
"ours" merge to avoid taking the 030 version of 23862.
2017-12-11 16:43:24 -05:00
Nick Mathewson
c55a054236
Merge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0
2017-12-11 16:41:28 -05:00
Nick Mathewson
418d8bbe92
Merge branch 'stack_fixes_032_v2' into maint-0.3.2
2017-12-11 16:25:04 -05:00
Nick Mathewson
35d56a127d
Add a changelog for the STACK fixes
2017-12-11 16:23:11 -05:00
Nick Mathewson
f539d89fd9
Move subtraction in rephist to try to avoid STACK warning
...
(I do not know why this one is happening)
2017-12-11 16:23:11 -05:00
Nick Mathewson
3da15bcbe8
Stop checking for sandbox:new_element() failures: it can't fail.
...
(It can't fail because the tor_malloc*() family of functions can
never return NULL)
Found with STACK
2017-12-11 16:06:25 -05:00
Nick Mathewson
472473ec5d
transport_new() cannot fail; do not check for it to fail.
...
(It can't fail because the tor_malloc*() family of functions can
never return NULL)
Found with STACK.
2017-12-11 16:06:00 -05:00
Nick Mathewson
252db6ad26
Merge branch 'maint-0.3.2'
2017-12-11 16:02:10 -05:00
David Goulet
057139d383
sched: Avoid integer overflow when computing tcp_space
...
In KIST, we could have a small congestion window value than the unacked
packets leading to a integer overflow which leaves the tcp_space value to be
humongous.
This has no security implications but it results in KIST scheduler allowing to
send cells on a potentially saturated connection.
Found by #24423 . Fixes #24590 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-12-11 15:45:19 -05:00
Nick Mathewson
ea929e8456
Merge remote-tracking branch 'public/feature24427'
2017-12-11 09:59:46 -05:00
Nick Mathewson
c2822bbc63
Fix compilation of 23459 patch.
...
The free() changes of 23447 had broken the pending 23459 patch.
2017-12-11 09:55:38 -05:00
Nick Mathewson
7803b19c43
Merge remote-tracking branch 'ffmancera/github/bug23459'
2017-12-11 09:53:39 -05:00
Nick Mathewson
030d3d52f5
Merge remote-tracking branch 'teor/comment24575'
2017-12-11 09:46:23 -05:00
Nick Mathewson
98682f689b
Merge branch 'maint-0.3.2'
2017-12-11 09:45:17 -05:00
Nick Mathewson
d68abbe358
Merge remote-tracking branch 'dgoulet/bug23603_032_02' into maint-0.3.2
2017-12-11 09:42:12 -05:00
Alexander Færøy
b0b8f7c30c
Add support for Android's logging subsystem.
...
This patch adds support for Android's logging subsystem in Tor. When
debugging Android applications it is useful to be able to collect
information about the application running on the platform via the
various system services that is available on the platform.
This patch allows you to add "Log notice android" to your torrc and have
Tor send everything above and including the notice severity to Android's
ring buffer which can be inspected using the 'adb logcat' program.
See: https://bugs.torproject.org/24362
2017-12-11 13:22:39 +00:00
Nick Mathewson
58e8094816
Fix compilation with --disable-memory-sentinels
...
We'd broken this with the recent _free() rewrite.
2017-12-11 08:01:54 -05:00
Alexander Færøy
78a582ed88
Restructure log initilization function to allow multiple backends without arguments.
...
This patch ensures that we more easily can extend our log backends that
does not take any additional argument other than a single keyword. This
patch is mostly reindentation of some code which is why it is split out
into its own patch.
See: https://bugs.torproject.org/24362
2017-12-11 13:00:48 +00:00
teor
35055cfa7f
Update the comment in options_transition_affects_guards()
...
It referred to the an old function name.
Fixes #24575 , bugfix on 0.3.0.
2017-12-11 03:18:48 +11:00
Nick Mathewson
6f3a862966
Run the download_status_increment test in a forked process.
...
It messes with global state somehow in a way that makes several of
the entryconn tests fail now.
2017-12-11 00:57:04 +11:00
teor
94ad47e332
fixup! Stop waiting for microdescs if the consensus supports IPv6 ORPorts
2017-12-11 00:53:49 +11:00
