Nick Mathewson
5f9808d1d7
Merge remote-tracking branch 'tor-github/pr/1596'
2019-12-17 09:39:50 -05:00
David Goulet
47d69d981e
Merge branch 'tor-github/pr/1608'
2019-12-17 09:30:19 -05:00
David Goulet
fa791b840a
Merge branch 'tor-github/pr/1609'
2019-12-17 09:26:49 -05:00
teor
11c8c4f23c
Merge branch 'pr1590_amended_commit'
2019-12-17 09:49:30 +10:00
Taylor Yu
616c0f823c
manpage: fixes to alphabetize General Options
2019-12-17 09:48:57 +10:00
Nick Mathewson
b4977d1aa9
Fix formatting in tor_assertf() message in struct_check_magic().
...
Closes 32771; bugfix on 0.4.2.1-alpha.
2019-12-16 15:31:23 -05:00
Nick Mathewson
df5c81fec0
Merge branch 'bug32765_041' into bug32771_042
2019-12-16 15:27:18 -05:00
Nick Mathewson
1b619a627c
Use CHECK_PRINTF() for printf-like functions in util_bug.h
2019-12-16 15:14:13 -05:00
George Kadianakis
e6bffeca64
Merge branch 'tor-github/pr/1591'
2019-12-16 22:01:10 +02:00
Mike Perry
e01e199005
Add changes file
2019-12-16 22:00:54 +02:00
Mike Perry
981350815d
Add circuit padding developer and quickstart docs.
2019-12-16 22:00:54 +02:00
Neel Chauhan
ec35593e42
Compact lines in test_e2e_rend_circuit_setup()
2019-12-16 14:26:12 -05:00
Neel Chauhan
f684fd79e9
Remove extra space from helper_get_circ_and_stream_for_test() call in test_e2e_rend_circuit_setup()
2019-12-16 14:19:55 -05:00
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
