6c5a73f87a
Merge remote-tracking branch 'ahf-oniongit/bugs/24362'
2017-12-12 09:18:52 -05:00
31ce03a2b9
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-12 09:13:12 -05:00
4c54021baf
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-12 09:13:12 -05:00
644ec835d5
Merge branch 'maint-0.3.2'
2017-12-12 09:13:12 -05:00
d3b7a2bd27
rename changes file
2017-12-12 09:13:05 -05:00
eecfed0cd2
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-11 16:56:31 -05:00
f7151387d9
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-11 16:56:31 -05:00
cdee62da9e
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-11 16:56:31 -05:00
da38904efb
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:56:31 -05:00
1deda2106b
Merge branch 'bug24167_025' into maint-0.2.5
2017-12-11 16:56:28 -05:00
eaaa1108a3
Merge branch 'maint-0.2.8' into maint-0.2.9
2017-12-11 16:54:14 -05:00
04524443d0
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-11 16:54:14 -05:00
2ea573ece8
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:54:14 -05:00
bc1ea4f470
Merge branch 'maint-0.2.5' into maint-0.2.8
2017-12-11 16:54:11 -05:00
f5d4bdf305
Merge remote-tracking branch 'public/ticket23856_025_01' into maint-0.2.5
2017-12-11 16:53:02 -05:00
736e7299ce
Merge branch 'maint-0.3.0' into maint-0.3.1
2017-12-11 16:51:58 -05:00
7fcb222ab7
Merge branch 'maint-0.2.9' into maint-0.3.0
2017-12-11 16:51:58 -05:00
7e486dd6f7
Merge remote-tracking branch 'public/bug23985_029' into maint-0.2.9
2017-12-11 16:51:54 -05:00
f7b41bcdf0
Merge branch 'bug24086_031' into maint-0.3.1
2017-12-11 16:49:01 -05:00
828333e38c
Merge remote-tracking branch 'public/bug24099_031' into maint-0.3.1
2017-12-11 16:48:44 -05:00
d2031f2c60
Merge remote-tracking branch 'public/bug23817_031' into maint-0.3.1
2017-12-11 16:45:54 -05:00
d5400d50e7
Merge branch 'maint-0.3.2'
2017-12-11 16:43:51 -05:00
acc462c965
Merge branch 'maint-0.3.1' into maint-0.3.2
2017-12-11 16:43:48 -05:00
ae608408e9
Merge remote-tracking branch 'asn/bug23862_031' into maint-0.3.1
2017-12-11 16:43:41 -05:00
c55a054236
Merge remote-tracking branch 'asn/bug23862_030' into maint-0.3.0
2017-12-11 16:41:28 -05:00
418d8bbe92
Merge branch 'stack_fixes_032_v2' into maint-0.3.2
2017-12-11 16:25:04 -05:00
35d56a127d
Add a changelog for the STACK fixes
2017-12-11 16:23:11 -05:00
252db6ad26
Merge branch 'maint-0.3.2'
2017-12-11 16:02:10 -05:00
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
f205dabf7a
Stop using event_base_once().
...
This function leaks memory when the event_base is freed before the
event itself fires. That's not harmful, but it's annoying when
trying to debug other memory leaks.
Fixes bug 24584; bugfix on 0.2.8.1-alpha.
2017-12-11 12:23:02 -05:00
3b465ebf2e
Changes file and tor_api.h tweaks for 24581.
2017-12-11 11:55:41 -05:00
e18840f619
Fix the log-severities memory-leak in tor-resolve.c
...
Also, rename the variable to have a more manageable name, and make
its scope more clear.
Fixes bug 24582; bugfix on 0.2.1.1-alpha.
2017-12-11 11:49:57 -05:00
d4c7bd98ac
Add changes file for 24531
2017-12-11 10:30:37 -05:00
ea929e8456
Merge remote-tracking branch 'public/feature24427'
2017-12-11 09:59:46 -05:00
7803b19c43
Merge remote-tracking branch 'ffmancera/github/bug23459'
2017-12-11 09:53:39 -05:00
98682f689b
Merge branch 'maint-0.3.2'
2017-12-11 09:45:17 -05:00
d68abbe358
Merge remote-tracking branch 'dgoulet/bug23603_032_02' into maint-0.3.2
2017-12-11 09:42:12 -05:00
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
94ad47e332
fixup! Stop waiting for microdescs if the consensus supports IPv6 ORPorts
2017-12-11 00:53:49 +11:00
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
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
0340c02975
Merge remote-tracking branch 'mikeperry/bug23114_squashed2'
2017-12-08 17:50:34 -05:00
5ee0cccd49
Merge branch 'macro_free_v2_squashed'
2017-12-08 14:58:43 -05:00
5508ee29d5
changes file for big free macro-ization branch
2017-12-08 14:47:19 -05:00
44010c6fc1
Merge branch 'dgoulet_ticket23709_033_01_squashed'
2017-12-08 14:44:09 -05:00
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
8559827280
Split client-side get_rend_circ into two functions.
...
Split hs_circuitmap_get_rend_circ_client_side(). One returns only established
circuits (hs_circuitmap_get_established_rend_circ_client_side()) and the other
returns all kinds of circuits.
Fixes #23459
Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera@gmail.com >
2017-12-08 18:14:08 +01:00
021fdd39e4
Use mach_approximate_time() for coarse time where available.
...
This lets us have a coarse-time implementation with reasonable
performance characteristics on OSX and iOS.
Implements 24427.
2017-12-08 09:24:02 -05:00
45b9b2245f
Merge branch 'maint-0.3.2'
2017-12-07 08:42:56 -05:00
4b41ffa64d
Merge branch 'arthuredelstein_18859+1_031' into maint-0.3.2
2017-12-07 08:42:49 -05:00
Nick Mathewson
David Goulet
Matt Traudt
Alexander Færøy
teor
Fernando Fernandez Mancera