Commit Graph

34766 Commits

Author SHA1 Message Date
teor
55b25ee6c6
Merge branch 'bug32240_32242_042' into bug32240_32242_master
Merge:
* libzstd-dev from ticket32242_042
* coccinelle from master
2019-12-16 09:25:38 +10:00
teor
8b5c11fbf6
Merge branch 'bug32240_32242_041' into bug32240_32242_042 2019-12-16 09:23:46 +10:00
teor
84c4ede052
Merge branch 'bug32240_32242_040' into bug32240_32242_041 2019-12-16 09:23:41 +10:00
teor
d96b35d663
Merge branch 'bug32240_32242_035' into bug32240_32242_040
Merge:
* libzstd-dev from ticket32242_035
* shellcheck from maint-0.4.0
2019-12-16 09:22:52 +10:00
teor
0b3763612c
Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035 2019-12-16 09:21:05 +10:00
teor
86ca3194aa
Merge branch 'bug32240_042' into bug32240_master 2019-12-16 09:17:02 +10:00
teor
da404910a7
Merge branch 'bug32240_041' into bug32240_042
Merge:
* CHUTNEY_TOR_SANDBOX=0 from bug32240_041
* RUST_VERSION from maint-0.4.2
2019-12-16 09:15:42 +10:00
teor
4a34fd5b74
Merge branch 'bug32240_040' into bug32240_041 2019-12-16 09:14:38 +10:00
teor
e2f78396f4
Merge branch 'bug32240_035' into bug32240_040 2019-12-16 09:14:32 +10:00
teor
75096de4c7
Merge branch 'bug32240_029' into bug32240_035
Merge
* Chutney Trusty deletion in bug32240_029
* NSS addition in maint-0.3.5
2019-12-16 09:09:16 +10:00
teor
37b04aeed7
changes: file for 32240 2019-12-16 09:06:25 +10:00
teor
0f07d25243
Travis: Run Chutney jobs in Ubuntu Bionic images
Closes 32240.
2019-12-16 09:03:48 +10:00
teor
704f3224a2
Travis: Turn off Tor's Sandbox in Chutney jobs
We need to set "Sandbox 0", until we fix sandbox errors that are
triggered by Ubuntu Xenial and Bionic. See 32722.

Part of 32240.
2019-12-16 09:01:45 +10:00
teor
5082eeba38
Merge branch 'maint-0.4.2' 2019-12-16 08:16:28 +10:00
teor
bd11fb1096
Merge branch 'maint-0.4.1' into maint-0.4.2 2019-12-16 08:16:20 +10:00
teor
ffccf6fc55
Merge branch 'maint-0.4.0' into maint-0.4.1 2019-12-16 08:16:12 +10:00
teor
7481172983
Merge branch 'maint-0.3.5' into maint-0.4.0 2019-12-16 08:16:04 +10:00
teor
1cd20ff848
Merge branch 'maint-0.2.9' into maint-0.3.5 2019-12-16 08:15:55 +10:00
teor
648399d6c2
Merge remote-tracking branch 'tor-github/pr/1505' 2019-12-16 08:15:19 +10:00
teor
933b0c1b1b
Merge remote-tracking branch 'tor-github/pr/1577' into maint-0.4.2 2019-12-16 08:14:29 +10:00
teor
05908d57f6
Merge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5 2019-12-16 08:14:04 +10:00
teor
7dd5946094
Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9 2019-12-16 08:13:38 +10:00
Nick Mathewson
1d0ccda595 Add torint.h include to confdecl.h.
This change allows other modules to include confdecl.h without
having first to include integer types they might not even use.
2019-12-15 11:46:05 -05:00
Nick Mathewson
a7b6c01468 Merge remote-tracking branch 'tor-github/pr/1598' 2019-12-13 11:09:17 -05:00
Taylor Yu
645acaf138 manpage: fix some quoting
Fix some quoting, especially of constructs like "[address:]port", that
were proving tricky for Asciidoctor tooling to parse correctly.

Also fix formatting of some configuration variable names that
contained double underscores.  Neither asciidoc nor asciidoctor was
rendering some of those correctly.

Part of ticket 32708.
2019-12-12 11:19:35 -06:00
Taylor Yu
6f31d7e048 manpage: section titles to 1-line
Change the section title formatting to use the one-line format.  This
allows Asciidoctor-based tooling to parse it more easily.

Part of ticket 32708.
2019-12-12 10:44:21 -06:00
Taylor Yu
8dff1d342d manpage: indent linebreak markup
Indent the asciidoc markup for lone linebreaks to match the preceding
paragraph line, so that Asciidoctor tools can format them correctly.

Part of ticket 32708.
2019-12-12 10:44:21 -06:00
Taylor Yu
4bc698f776 changes file for ticket 32708 2019-12-12 10:44:21 -06:00
Taylor Yu
1e3f53d613 manpage: minor formatting fixes
These are unrelated changes done by Swati while doing the alphabetizing.

Part of ticket 32708.
2019-12-12 10:44:21 -06:00
Swati Thacker
21b3073b9a manpage: alphabetize General Options
Part of ticket 32708.
2019-12-12 10:44:21 -06:00
teor
f9a243a9d4
changes: update changes file for 32609 2019-12-12 16:12:18 +10:00
teor
36dce6836d
Makefile: Remove the broken, duplicate check-practracker-unit-test
This test doesn't set PYTHON, and ignores USE_PYTHON. And it's already
listed in TEST_SCRIPTS.

Fixes CI issue 32705.
2019-12-12 16:08:05 +10:00
teor
0bb879e821
src/ext: Add __future__ imports for python 3 compatibility
Closes ticket 32732.
2019-12-12 15:59:47 +10:00
teor
1619f14a04
python: Add __future__ imports for python 3 compatibility
Except for src/ext, which we may not want to modify.

Closes ticket 32732.
2019-12-12 15:58:51 +10:00
Taylor Yu
0fd49c6663 Document high-level architecture goals
Create a high-level description of the long-term software architecture
goals.  Closes ticket 32206.
2019-12-10 16:47:38 -06:00
Nick Mathewson
fefa08df75 Add a changes file for ticket 32172. 2019-12-10 15:56:06 -05:00
Hans-Christoph Steiner
4d4cbf739f set up tmp dir for test suite to run on Android
There is no /tmp or mkdtemp on Android, there is /data/local/tmp for
root and the shell user. So this fakes mkdtemp.  Also, FYI, tor might
not like the default perms of /data/local/tmp, e.g. 0770.

https://trac.torproject.org/projects/tor/ticket/32172
2019-12-10 15:55:40 -05:00
Neel Chauhan
a8b5b9a1bc In cancel_descriptor_fetches(), use connection_list_by_type_purpose() instead of connection_list_by_type_state() 2019-12-10 12:00:38 -05:00
George Kadianakis
a38014e5c6 Merge branch 'tor-github/pr/1581' 2019-12-10 18:34:00 +02:00
David Goulet
fc32349adc hs-v3: Handle client rendezvous circuit timeout
With v3, the "pending_final_cpath" of a circuit is always NULL which means
that for v3, established client rendezvous circuit waiting for the intro point
to ACK, will always end up timing out quickly.

This can increase the delays to which you connect to a service since in order
to succeed, the rendezvous circuit needs to fully established
(CIRCUIT_PURPOSE_C_REND_JOINED) within the cutoff of the introduction circuit
as well which is these days around 2-3 seconds.

Fixes #32021

Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-12-10 18:33:48 +02:00
David Goulet
71767b06ae Merge branch 'tor-github/pr/1583' 2019-12-10 09:42:09 -05:00
George Kadianakis
c959ea7558 hs-v3: Fix memory leak in test_hs_control_store_permanent_creds() 2019-12-10 09:42:05 -05:00
Nick Mathewson
944bdde50e Merge branch 'maint-0.4.2'
"ours" to avoid version bump.
2019-12-09 16:04:09 -05:00
Nick Mathewson
b7d18f8610 bump to 0.4.2.5-dev 2019-12-09 16:03:31 -05:00
Nick Mathewson
17561434eb Merge branch 'maint-0.4.1' into maint-0.4.2
"ours" to avoid version bump.
2019-12-09 16:03:01 -05:00
Nick Mathewson
7174a80edd bump to 0.4.1.7-dev 2019-12-09 16:02:36 -05:00
Nick Mathewson
7aaf714e8e Merge branch 'maint-0.4.0' into maint-0.4.1 2019-12-09 16:02:07 -05:00
Nick Mathewson
b9504f788c Bump version to 0.4.0.6-dev 2019-12-09 16:01:56 -05:00
Nick Mathewson
651d29c0f7 Merge branch 'maint-0.3.5' into maint-0.4.0
"ours" to avoid version bump.
2019-12-09 16:01:22 -05:00
Nick Mathewson
0c4f0ec977 bump to 0.3.5.9-dev 2019-12-09 16:01:11 -05:00