Nick Mathewson
102b4f3a92
remove changes files that will appear in 0.3.2.7-rc
2017-12-13 12:08:52 -05:00
Nick Mathewson
8441189b3c
Changes file for 24374, merged earlier.
2017-12-13 09:50:57 -05:00
Nick Mathewson
426110dfa2
Merge branch 'maint-0.3.2'
2017-12-12 19:46:53 -05:00
Nick Mathewson
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
Nick Mathewson
9abef516f6
Merge branch 'maint-0.3.2'
2017-12-12 19:27:14 -05:00
Nick Mathewson
bf89b08930
Merge branch 'bug24367_032_squashed' into maint-0.3.2
2017-12-12 19:17:38 -05:00
teor
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
e622f208a3
Merge remote-tracking branch 'teor/bug23827-v2'
2017-12-12 09:27:03 -05:00
Nick Mathewson
6c5a73f87a
Merge remote-tracking branch 'ahf-oniongit/bugs/24362'
2017-12-12 09:18:52 -05:00
Nick Mathewson
4c54021baf
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-12 09:13:12 -05:00
Nick Mathewson
644ec835d5
Merge branch 'maint-0.3.2'
2017-12-12 09:13:12 -05:00
Nick Mathewson
31ce03a2b9
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-12 09:13:12 -05:00
Nick Mathewson
d3b7a2bd27
rename changes file
2017-12-12 09:13:05 -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
da38904efb
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:56:31 -05:00
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
1deda2106b
Merge branch 'bug24167_025' into maint-0.2.5
2017-12-11 16:56:28 -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
eaaa1108a3
Merge branch 'maint-0.2.8' into maint-0.2.9
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
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
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
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
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
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
7803b19c43
Merge remote-tracking branch 'ffmancera/github/bug23459'
2017-12-11 09:53:39 -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
teor
94ad47e332
fixup! Stop waiting for microdescs if the consensus supports IPv6 ORPorts
2017-12-11 00:53:49 +11:00
teor
bbc781885d
fixup! Add networkstatus_consensus_has_ipv6() and unit tests
...
This is what happens when you don't run:
make check-spaces
make check-changes
2017-12-11 00:53:03 +11:00
teor
b66b62fb75
Stop waiting for microdescs if the consensus supports IPv6 ORPorts
...
Also make IPv6-only clients wait for microdescs for relays, even if we were
previously using descriptors (or were using them as a bridge) and have
a cached descriptor for them.
But if node_is_a_configured_bridge(), stop waiting for its IPv6 address in
a microdescriptor, because we'll never use it.
Implements #23827 .
2017-12-11 00:34:31 +11:00
Nick Mathewson
0340c02975
Merge remote-tracking branch 'mikeperry/bug23114_squashed2'
2017-12-08 17:50:34 -05:00
Nick Mathewson
5ee0cccd49
Merge branch 'macro_free_v2_squashed'
2017-12-08 14:58:43 -05:00
Nick Mathewson
5508ee29d5
changes file for big free macro-ization branch
2017-12-08 14:47:19 -05:00
Nick Mathewson
44010c6fc1
Merge branch 'dgoulet_ticket23709_033_01_squashed'
2017-12-08 14:44:09 -05:00
David Goulet
50124fd7a6
chan: Add changes file for ticket 23709
...
Closes #23709
Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-12-08 14:43:27 -05:00
