teor
fb541ffca3
Merge branch 'maint-0.4.0' into maint-0.4.1
2020-01-16 10:00:40 +10:00
teor
026f068bb3
Merge branch 'maint-0.3.5' into maint-0.4.0
2020-01-16 10:00:32 +10:00
teor
19954cffd7
Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5
2020-01-16 09:57:27 +10:00
Alexander Færøy
ca9a5390ff
Don't escape the bridge distribution value.
...
We already check if there are invalid values in
check_bridge_distribution_setting() and reject the value if that is the
case. We can therefore only have strings of [A-Z] | [a-z] | [0-9] | '-'
| '_' here which is according to the directory specification.
See: https://bugs.torproject.org/32753
2020-01-15 23:41:58 +00:00
Nick Mathewson
5e70c27e85
Merge remote-tracking branch 'tor-github/pr/1657'
2020-01-15 13:10:14 -05:00
teor
5fa7c1b13f
Merge remote-tracking branch 'tor-github/pr/1661'
2020-01-16 00:46:31 +10:00
David Goulet
b958529dbf
Merge branch 'tor-github/pr/1633'
2020-01-14 14:03:21 -05:00
Nick Mathewson
08bbb6b8d9
Merge branch 'ticket32892_043_01_squashed'
2020-01-14 13:31:20 -05:00
David Goulet
59dac38ebe
chan: Remove dead var cell handler from channel_t
...
The variable lenght cells are handled directly by
channel_tls_handle_var_cell() from an OR connection reading its inbuf. The
channel var cell handler (agnostic) was never used.
Closes #32892
Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-01-14 13:31:08 -05:00
Nick Mathewson
165a92e33f
Replace an assertion with a check-and-log
...
We hit this assertion with bug 32868, but I'm stymied figuring out
how we wound up with a routerstatus like this. This patch is a
diagnostic to attempt to figure out what is going on, and to avoid a
crash in the meantime.
2020-01-14 13:16:39 -05:00
Nick Mathewson
c948db4252
Merge remote-tracking branch 'tor-github/pr/1636'
2020-01-14 12:46:14 -05:00
Nick Mathewson
c2dc94d8eb
Merge branch 'ticket32883'
2020-01-14 12:42:41 -05:00
Nick Mathewson
dec11793ba
Merge branch 'ticket32825_squashed'
2020-01-14 12:42:19 -05:00
Nick Mathewson
8ab9f93993
changes file for 32825
2020-01-14 12:42:13 -05:00
Nick Mathewson
75741c6b3a
Merge remote-tracking branch 'tor-github/pr/1659'
2020-01-14 12:40:07 -05:00
teor
8095c785f1
Merge branch 'maint-0.4.2'
2020-01-14 17:41:44 +10:00
teor
7e111d0eaa
practracker: print a notice to stderr when disabled
...
When TOR_DISABLE_PRACTRACKER is set, print a message to
stderr when skipping practracker checks.
Part of 32705.
2020-01-14 17:41:00 +10:00
Neel Chauhan
8d288eb3a7
Deprecate the ClientAutoIPv6ORPort option
2020-01-13 14:55:16 -08:00
Nick Mathewson
6b1592b564
test_practracker.sh: never disable practracker
...
When practracker is disabled, its output will be empty. We don't
want that happening during our tests.
Fixes bug 32705; bugfix on 0.4.2.1-alpha, when test_practracker.sh
was introduced.
2020-01-13 16:17:51 -05:00
Nick Mathewson
8b46372f26
Merge branch 'pr_1643_squashed'
2020-01-13 13:26:23 -05:00
Swati Thacker
ec52c8ed69
manpage: alphabetize client options
...
Alphabetize client options in tor.1.txt. Closes ticket32846.
2020-01-13 13:26:12 -05:00
Nick Mathewson
73ac1add3f
Split core/include.am into per-subdirectory include.am files
...
Closes ticket 32137.
2020-01-13 09:34:17 -05:00
Nick Mathewson
5888db4967
Merge branch 'disable_ns_macro'
2020-01-09 16:02:41 -05:00
Nick Mathewson
93894fb770
Merge branch 'ticket22029_attempt_squashed'
2020-01-09 15:27:32 -05:00
Neel Chauhan
686c5e90a3
Add changes file for Bug #22029
2020-01-09 15:27:26 -05:00
Nick Mathewson
079912de4d
Changes file for ticket 32887 (NS*() removal)
2020-01-09 11:51:46 -05:00
Nick Mathewson
e45810113b
Merge branch 'pre_formatter_cleanups_squashed'
2020-01-09 07:32:39 -05:00
Nick Mathewson
8b2041c343
changes file for 32764.
2020-01-09 07:30:35 -05:00
teor
1fd27155d4
changes: file for 32845
2020-01-07 10:16:08 -05:00
Nick Mathewson
1b63eea66c
Merge branch 'haxxpop/tcp_proxy_squashed' into tcp_proxy_squshed_and_merged
2020-01-06 13:41:20 -05:00
Suphanat Chunhapanya
14d781fff6
circuit: Add change file
2020-01-06 13:39:10 -05:00
Nick Mathewson
e08d07692f
Add documentation about building a TAGS file.
...
Patch from opara. Closes ticket 32779.
2020-01-06 13:31:30 -05:00
Nick Mathewson
1f498220bd
Merge remote-tracking branch 'tor-github/pr/1620'
2020-01-06 13:28:10 -05:00
Nick Mathewson
48f7341783
Merge branch 'maint-0.4.2'
2020-01-06 13:24:01 -05:00
Nick Mathewson
6da989cfe8
Merge remote-tracking branch 'tor-github/pr/1612' into maint-0.4.2
2020-01-06 13:20:57 -05:00
Nick Mathewson
4f6901d7cc
When initializing pthreads, always set the main thread.
...
Fixes bug 32884. This is a bugfix on 0.3.3.1-alpha, when we started
allowing restart-in-process with tor_api.h.
2020-01-06 09:37:12 -05:00
Nick Mathewson
dca2629480
Use tor_api.h entry points in ntmain.c.
...
When we updated main.c to use the same entry points as tor_api.h, we
didn't update ntmain.c. This led to bugs as the two got out of
sync.
There are two calls that we drop in this patch: first, I drop the
call to set_main_thread(), since that's redundant with the init
function in compat_winthreads.c (but see #32884 ). Second, I drop
the check for CMD_RUN_TOR: I'll add that back with a subsequent
commit.
Closes ticket 32883.
2020-01-06 09:24:15 -05:00
Nick Mathewson
54eec5342d
Initialize publish/subscribe code when running as an NT service.
...
Fixes bug 32778; bugfix on 0.4.1.1-alpha.
2020-01-06 09:22:57 -05:00
Nick Mathewson
13216f848a
Merge branch 'maint-0.4.2'
2020-01-06 08:08:59 -05:00
Nick Mathewson
2d8d6d1ebf
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-01-06 08:08:59 -05:00
Nick Mathewson
f5461a4bdf
update changes file to pass "make check-changes"
2020-01-06 08:08:48 -05:00
Nick Mathewson
16e94dc7a7
Merge branch 'maint-0.4.1' into maint-0.4.2
2020-01-06 08:06:54 -05:00
Peter Gerber
b9d81282e0
Fix sandbox crash during reload of logging configuration
...
Allow calls to dup() which was introduced in commit a22fbab986
2020-01-05 15:24:45 +00:00
rl1987
52bbc7fb49
Add changes file
2019-12-30 13:02:04 +07:00
Nick Mathewson
33a0f15b21
Merge branch 'bug29819_035'
2019-12-20 07:37:47 -05:00
teor
7237637871
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-20 10:12:43 +10:00
teor
7e17c24381
Merge remote-tracking branch 'tor-github/pr/1606'
2019-12-20 10:12:18 +10:00
Nick Mathewson
42e31b5c45
Mark TestingEstimatedDescriptorPropagationTime as obsolete.
...
We stopped looking at this option in 85cf6dcba3
2019-12-19 11:04:48 -05:00
Nick Mathewson
3663df6937
changes file for ticket 32806
2019-12-19 10:49:57 -05:00
George Kadianakis
b7304027f6
Merge branch 'tor-github/pr/1587'
2019-12-18 14:19:15 +02:00
Nick Mathewson
08bfc2d71a
Merge branch 'ticket32172_once_again'
2019-12-17 15:02:06 -05:00
Peter Gerber
0d64bafcfe
Correct how we use libseccomp
...
This fixes a startup crash with libseccomp v2.4.0 if Sandbox is
set to 1.
2019-12-17 09:47:28 -05:00
Nick Mathewson
5f9808d1d7
Merge remote-tracking branch 'tor-github/pr/1596'
2019-12-17 09:39:50 -05:00
teor
11c8c4f23c
Merge branch 'pr1590_amended_commit'
2019-12-17 09:49:30 +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
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
5082eeba38
Merge branch 'maint-0.4.2'
2019-12-16 08:16:28 +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
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
Taylor Yu
4bc698f776
changes file for 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
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
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
Taylor Yu
7bd7089988
changes file for ticket 30984
2019-12-09 09:55:04 -06:00
Nick Mathewson
e93801bfe6
Port changelog tools to python 3
...
Closes ticket 32704.
2019-12-09 10:53:48 -05:00
Nick Mathewson
089466eff3
Merge branch 'maint-0.4.2'
2019-12-06 16:02:08 -05:00
Nick Mathewson
3248630fc8
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-12-06 16:02:08 -05:00
Nick Mathewson
6513102b9d
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-06 16:02:08 -05:00
Nick Mathewson
c7ca3fc186
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-12-06 16:02:07 -05:00
Nick Mathewson
74cae547e5
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-12-06 16:02:07 -05:00
Karsten Loesing
b7b467d3af
Update geoip and geoip6 to the December 3 2019 database.
2019-12-06 11:50:35 +01:00
teor
f86d508d49
changes: file for 32629
2019-12-06 10:52:19 +10:00
teor
a277f28947
changes: file for 32629
2019-12-06 10:51:43 +10:00
teor
b84e7715da
changes: file for 32629
2019-12-06 10:51:05 +10:00
Nick Mathewson
37d1ee554d
Remove changes files that are scheduled for inclusion in 0.4.2.5
2019-12-05 13:27:46 -05:00
teor
cfa9cc34aa
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-05 10:14:01 +10:00
teor
92fb099067
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-12-05 10:13:53 +10:00
teor
46057ec5ae
Merge remote-tracking branch 'tor-github/pr/1424' into maint-0.4.0
2019-12-05 10:13:15 +10:00
teor
aee966cb06
Merge remote-tracking branch 'tor-github/pr/1277' into maint-0.3.5
2019-12-05 10:11:18 +10:00
Nick Mathewson
fcb5656128
Merge branch 'ticket32609_squashed'
2019-12-04 12:15:28 -05:00
teor
5ce45ac907
Makefile/git scripts: Add the practracker unit tests
...
Add a check-practracker-unit-test target, and run it as part of
"make check".
Add the practracker unit tests to scripts/git/pre-commit.git-hook.
Part of 32609.
2019-12-04 12:15:22 -05:00
teor
a4c22164c0
Merge branch 'maint-0.4.2'
2019-12-03 12:47:05 +10:00
teor
3207a8e5c2
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-12-03 12:46:58 +10:00
teor
14089a29b5
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-12-03 12:46:50 +10:00
teor
febbc236d4
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-12-03 12:46:43 +10:00
teor
145ff92d92
Merge branch 'maint-0.2.9' into maint-0.3.5
...
Merge C_DIALECT_OPTIONS from ticket32500_029 with
other configure options from maint-0.3.5.
2019-12-03 12:45:41 +10:00
teor
792c15fde2
Travis: use -std=gnu99 in some jobs
...
Require C99 standards-conforming code in Travis CI, but allow GNU gcc
extensions. Also activates clang's -Wtypedef-redefinition warnings.
Builds some jobs with -std=gnu99, and some jobs without.
Closes ticket 32500.
2019-12-03 12:42:39 +10:00
George Kadianakis
53bdd21179
Merge branch 'tor-github/pr/1559'
2019-12-02 12:52:44 +02:00
teor
4a157c7569
Merge branch 'ticket32629_041' into ticket32629_042
...
Merge RUST_VERSION from maint-0.4.2 with disabling the macOS Rust
job from ticket32629_041.
2019-12-01 20:28:44 +10:00
teor
a00b9e5a86
Merge branch 'ticket32629_040' into ticket32629_041
2019-12-01 20:26:55 +10:00
teor
349554f40d
Merge branch 'ticket32629_035' into ticket32629_040
2019-12-01 20:26:51 +10:00
teor
96e620caaf
Merge remote-tracking branch 'tor-github/pr/1574'
2019-12-01 17:53:06 +10:00
teor
f2f7491cd9
Merge branch 'ticket32629_029' into ticket32629_035
...
Merge re-enable chutney from ticket32629_029 with
stem from maint-0.3.5.
2019-11-28 12:21:08 +10:00
teor
99b5f1b261
Revert "Travis: Disable all but one macOS build"
...
This reverts commit 511aeba8ee
2019-11-28 12:10:10 +10:00
George Kadianakis
68a00c4951
Merge branch 'tor-github/pr/1573'
2019-11-27 15:36:26 +02:00
David Goulet
85b984dbc6
hs: Add changes file for 32020
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-11-27 14:52:09 +02:00
Neel Chauhan
99cf3f99c0
Make control_event_conf_changed() take a config_line_t
2019-11-26 22:12:23 -05:00
Nick Mathewson
031f204a10
configure: reject Python 2.
...
Python 2 will be end-of-life as of 1 Jan 2020, so we can finally
stop supporting it. As a first step, we should make our configure
script stop accepting python 2 as something acceptable to run our
tests with.
Closes ticket 32608.
2019-11-25 13:01:04 -05:00
Nick Mathewson
31f8b4fa65
Merge branch 'stream-socks-auth' into bug19859_merged
2019-11-25 07:58:02 -05:00
teor
26071aa3be
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-11-25 12:37:07 +10:00
teor
055f5d4d1b
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-11-25 12:36:59 +10:00
teor
c17ab20ac0
Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.0
2019-11-25 12:36:41 +10:00
teor
ed6f2f61a2
Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.0
2019-11-25 12:35:58 +10:00
teor
501b5174d8
Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5
2019-11-25 12:35:11 +10:00
teor
400cee261e
Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.3.5
2019-11-25 12:34:29 +10:00
teor
54c01119ed
Merge remote-tracking branch 'tor-github/pr/1405' into maint-0.3.5
2019-11-25 12:33:55 +10:00
teor
83424cb62f
Merge remote-tracking branch 'tor-github/pr/1395' into maint-0.3.5
2019-11-25 12:33:14 +10:00
teor
f9812ee5f7
Merge remote-tracking branch 'tor-github/pr/1394' into maint-0.3.5
2019-11-25 12:29:43 +10:00
Nick Mathewson
75f417fd0c
changes file for 29826
2019-11-23 15:35:59 -05:00
Nick Mathewson
d8ff7d0236
Merge branch 'reversible_3'
2019-11-21 07:49:18 -05:00
David Goulet
cb11276068
hs-v3: Add changes file for ticket #30382
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-11-21 13:02:29 +02:00
Nick Mathewson
a30d143228
Make KeyDirectory's GroupReadable behave the same as CacheDirectory's.
...
In #26913 we solved a bug where CacheDirectoryGroupReadable would
override DataDirectoryGroupReadable when the two directories are the
same. We never did the same for KeyDirectory, though, because
that's a rare setting.
Now that I'm testing this code, though, fixing this issue seems
fine. Fixes bug #27992 ; bugfix on 0.3.3.1-alpha.
2019-11-20 09:26:47 -05:00
George Kadianakis
53ac9a9a91
Add changes file for #30381 .
2019-11-18 19:21:10 +02:00
teor
c34fb3413d
Merge remote-tracking branch 'tor-github/pr/1517'
2019-11-18 11:21:37 +10:00
teor
825f52784d
Merge remote-tracking branch 'tor-github/pr/1535'
2019-11-15 12:11:32 +10:00
teor
b58e5091b7
Merge remote-tracking branch 'tor-github/pr/1533'
2019-11-15 12:11:22 +10:00
David Goulet
1371d29e5b
Merge branch 'tor-github/pr/1489'
2019-11-14 10:37:14 -05:00
Nick Mathewson
a76b7cd8b5
Merge remote-tracking branch 'tor-github/pr/1531'
2019-11-14 09:58:37 -05:00
teor
0df8bcfb6f
relay: Disable relay_sys when the relay module is disabled
...
Closes ticket 32245.
2019-11-14 16:27:06 +10:00
teor
88c2a23c4b
relay: Disable relay_periodic when the relay module is disabled
...
Closes ticket 32244.
2019-11-14 16:17:17 +10:00
teor
ef00b1ce0f
dirauth: Remove a HAVE_MODULE_DIRAUTH inside a function
...
There are now no HAVE_MODULE_{DIRAUTH,RELAY} inside functions.
Closes ticket 32163.
2019-11-14 15:43:27 +10:00
teor
b2b61b0268
changes: Update the changes file for 32410
...
When the relay module is disabled, we change the ClientOnly
default to 1. But we forgot to mention that in the changes file.
2019-11-14 15:39:40 +10:00
teor
9f37c0f4f2
changes: file for 32451
2019-11-14 13:12:42 +10:00
teor
4514bfe9c2
test/parseconf: Stop ignoring --dump-config failures
...
When we added the $FILTER for Windows newlines, we made
the pipeline always exit successfully, even if tor failed.
Fixes bug 32468; bugfix on 0.4.2.1-alpha.
2019-11-14 10:55:21 +10:00
Nick Mathewson
79bac44293
Remove changes files that are already merged into 0.4.2.4-rc.
2019-11-12 16:48:12 -05:00
Nick Mathewson
fc1316b559
Merge branch 'ticket32467'
2019-11-12 13:19:12 -05:00
Nick Mathewson
c11c1d0623
Merge remote-tracking branch 'tor-github/pr/1367'
2019-11-12 12:18:14 -05:00
Nick Mathewson
6d9db29dda
Document --dump-config.
...
Closes ticket 32467.
2019-11-12 08:19:35 -05:00
teor
2ee04fc309
config: Log the option name when skipping an obsolete option
...
This is a basic fix for 0.4.2 only. The fix for 0.4.3 and later
is in 32404.
Fixes bug 32295; bugfix on 0.4.2.1-alpha.
2019-11-12 10:07:12 +10:00
Nick Mathewson
7c3378fb8d
Merge remote-tracking branch 'tor-github/pr/1338'
2019-11-11 12:20:14 -05:00
Nick Mathewson
4462766d32
Merge branch 'ticket32404'
2019-11-11 11:54:14 -05:00
Nick Mathewson
2b3dc3384c
Merge branch 'ticket32385'
2019-11-11 10:38:10 -05:00
Nick Mathewson
b1083584c7
Clarify that "missing-doc-warnings" makes doxygen warnings nonfatal
2019-11-11 10:38:04 -05:00
liberat
4e4c4e72d7
Handle binary IPv6 addresses and bracketed strings in RESOLVE_PTR.
...
When a SOCKS5 client sends a RESOLVE_PTR request, it must include
either an IPv4 or IPv6 address. In the past this was required to be a
binary address (address types 1 or 4), but since the refactoring of
SOCKS5 support in Tor 0.3.5.1-alpha, strings (address type 3) are also
allowed if they represent an IPv4 or IPv6 literal.
However, when a binary IPv6 address is provided,
parse_socks5_client_request converts it into a string enclosed in
brackets. This doesn't match what string_is_valid_ipv6_address
expects, so this would fail with the error "socks5 received
RESOLVE_PTR command with hostname type. Rejecting."
By replacing string_is_valid_ipv4_address/string_is_valid_ipv6_address
with tor_addr_parse, we accept strings both with and without brackets.
This fixes the handling of binary addresses, and also improves
symmetry with CONNECT and RESOLVE requests.
Fixes bug 32315.
2019-11-11 15:34:38 +00:00
Nick Mathewson
29eb7b07ef
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-11-11 10:14:04 -05:00
Nick Mathewson
a920597f62
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-11-11 10:14:04 -05:00
Nick Mathewson
eb8ea92cf9
Merge branch 'maint-0.4.2'
2019-11-11 10:14:04 -05:00
Nick Mathewson
329aa1c48e
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-11-11 10:14:03 -05:00
Nick Mathewson
7beaaed245
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-11-11 10:14:03 -05:00
teor
8af8ed72b2
Merge branch 'maint-0.4.2'
2019-11-11 14:20:03 +10:00
teor
8b1f99c29d
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-11-11 14:19:55 +10:00
teor
7043be968a
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-11-11 14:19:47 +10:00
teor
29940511e3
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-11-11 14:19:39 +10:00
teor
2abff832dd
Appveyor: Install OpenSSL to resolve a header/library mismatch
...
Install the mingw OpenSSL package in Appveyor. This makes sure that
the OpenSSL headers and libraries match in Tor's Appveyor builds.
(This bug was triggered by an Appveyor image update.)
Fixes bug 32449; bugfix on 0.3.5.6-rc.
2019-11-11 13:19:15 +10:00
Karsten Loesing
853b6ad095
Update geoip and geoip6 to the November 6 2019 database.
2019-11-09 10:10:19 +01:00
Nick Mathewson
a08969e460
Refactor "OBSOLETE" type
...
It no longer warns, and is now defined in terms of an "IGNORE" type.
(The "IGNORE" type is the same as "OBSOLETE", except that it is not
reported as obsolete. It should be useful for disabled modules.)
Closes ticket 32404.
2019-11-07 11:01:25 -05:00
Nick Mathewson
c9b2fe0460
Changes file for 32415 (struct name uniformity)
2019-11-07 08:56:18 -05:00
Nick Mathewson
32a2f96f82
Add the ability to fail when a hardware accelerator is missing.
...
Closes ticket 32406.
2019-11-07 07:28:43 -05:00
Nick Mathewson
0d8504e70b
crypto config: do not change the user's value of HardwareAccel.
...
We still interpret "AccelName" as turning on the "HardwareAccel"
feature, but we no longer modify the user's options here.
Fixes bug 32382; bugfix on 0.2.2.1-alpha when we added openssl
engine support.
2019-11-07 07:28:43 -05:00
teor
aaef9a2519
relay: Stop failing on startup when the relay module is disabled
...
When the relay module is disabled, make "ClientOnly 1" and
"DirCache 0" by default. (But keep "ClientOnly 0" and
"DirCache 1" as the defaults for the unit tests.)
And run "make autostyle".
Part of ticket 32410.
2019-11-07 11:43:41 +10:00
teor
e466c84ed3
Merge branch 'maint-0.4.2'
2019-11-07 10:51:48 +10:00
teor
1f3bf10d3f
Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.4.2
2019-11-07 10:51:22 +10:00
Nick Mathewson
4d70e725d1
Do not try to shut down the event loop when it is not initialized.
...
Doing so caused us to crash in some unusual circumstances, such as
using --verify-config to verify a configuration that failed during
the options_act() stage.
Fixes bug 32407; bugfix on 0.3.3.1-alpha.
2019-11-06 11:33:23 -05:00
David Goulet
65013a6924
changes: Add file for ticket #31371
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-11-06 10:27:34 -05:00
Nick Mathewson
059a5795d3
Merge branch 'maint-0.4.2'
2019-11-06 08:57:21 -05:00
Nick Mathewson
8f6dc54e3c
Merge remote-tracking branch 'tor-github/pr/1495' into maint-0.4.2
2019-11-06 08:57:14 -05:00
teor
22482fd454
test/parseconf: Add support for optional library variants
...
test_parseconf.sh now supports:
* {error,expected}{,_lzma,_nss,_zstd}{,_no_dirauth,_no_relay_dirauth}
Or any combination of two or more optional libraries.
Closes ticket 32397.
2019-11-06 21:36:42 +10:00
teor
89f52f36e0
Merge remote-tracking branch 'tor-github/pr/1510'
2019-11-06 21:29:18 +10:00
teor
c3a1e15a5e
Merge remote-tracking branch 'tor-github/pr/1509' into maint-0.4.2
2019-11-06 21:28:28 +10:00
teor
23ff60c150
Merge branch 'maint-0.4.2'
2019-11-06 17:04:52 +10:00
teor
f7b45975bf
Merge branch 'bug32402_042' into bug32402_master
...
Merge changes from master with shellcheck fixes.
2019-11-06 16:14:06 +10:00
teor
7f23d47f72
shellcheck: Fix issues in the git-*.sh scripts
...
Fixes bug 32402; bugfix on 0.4.2.1-alpha.
Obviously correct changes to already reviewed code.
2019-11-06 16:09:31 +10:00
teor
57baea701f
shellcheck: Start checking most scripts for errors
...
This check was accidentally disabled by a bad find command.
Fixes bug 32402; bugfix on 0.4.2.1-alpha.
Obviously correct changes to already reviewed code.
2019-11-06 15:49:50 +10:00
teor
10ef7a31cf
Makefile: Fix "make check-includes" for out-of-tree builds
...
Previously, it would run on the build tree, which did not contain
any sources.
Fixes bug 31335; bugfix on 0.3.5.1-alpha.
2019-11-06 12:30:19 +10:00
teor
de6ceb0bee
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-11-06 11:19:46 +10:00
teor
03e77ef036
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-11-06 11:19:38 +10:00
teor
1bde356bf6
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-11-06 11:19:30 +10:00
teor
4f9a003392
Merge remote-tracking branch 'tor-github/pr/1374' into maint-0.4.1
2019-11-06 11:19:13 +10:00
teor
4abfcb7997
Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5
2019-11-06 11:18:09 +10:00
teor
0e2834a371
Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5
2019-11-06 11:17:43 +10:00
teor
d2e4262ebc
Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5
2019-11-06 11:17:01 +10:00
teor
6bfdd09679
Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5
2019-11-06 11:16:09 +10:00
teor
0650bf3695
Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9
2019-11-06 11:15:45 +10:00
teor
c06d540ff9
Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9
2019-11-06 11:14:53 +10:00
Nick Mathewson
d3e547b2bd
Re-think our doxygen warnings wrt missing docs and fatalness.
...
Up till now, we have warned about all missing documentation, which
meant that we could never make doxygen warnings fatal. This has led
to our doxygen output getting full of errors several times in the
past.
This commit changes our approach to doxygen warnings: missing
documentation warnings are only on when the user asks for them with
--enable-missing-doc-warnings. When that option is not present,
doxygen respects the --enable-fatal-warnings flag.
Closes ticket 32385.
2019-11-05 12:24:02 -05:00
teor
804d7c9bfc
configure: Remove a check that will always fail
...
And update the changes file to be more specific.
Part of 32191.
2019-11-05 15:48:01 +10:00
Hans-Christoph Steiner
2a349006b9
force pkg-config to only use --prefix when cross-compiling
...
The current pkg-config setup has no sense of whether it is cross-compiling,
so it will detect things on the build system that are not present or are
wrong for the host system. This forces the cross-compiling build to only
look for pkg-config .pc files in --prefix.
A version of this has been the setup for many years with the Android builds.
Fixes #32191
Signed-off-by: Hans-Christoph Steiner <hans@eds.org>
2019-11-05 15:45:25 +10:00
teor
655603c779
Merge remote-tracking branch 'tor-github/pr/1487'
...
Combine V_IMMUTABLE and FILENAME changes on PidFile.
2019-11-05 14:26:23 +10:00
teor
b9269d6d0a
Merge remote-tracking branch 'tor-github/pr/1486'
2019-11-05 14:23:56 +10:00
teor
6169469546
Merge remote-tracking branch 'tor-github/pr/1477'
2019-11-05 14:23:10 +10:00
teor
81972353cb
scripts: Fix update_versions.py for out-of-tree builds
...
Fixes bug 32371; bugfix on 0.4.0.1-alpha.
2019-11-05 12:00:59 +10:00
teor
9e2a2d38f4
Makefile: Fix "make autostyle" for out-of-tree builds
...
Fixes bug 32370; bugfix on 0.4.1.2-alpha.
2019-11-05 12:00:57 +10:00
teor
96334d6f7f
changes: file for 32213
2019-11-05 11:26:26 +10:00
teor
233b96d83a
test/parseconf: Always show the result file name on failure
...
Obviously correct fixes on already reviewed code.
2019-11-05 11:12:50 +10:00
teor
5b04db59f6
test/scripts: Use the same code to find the tor binary
...
This change makes sure we are always using the coverage binary, when
coverage is enabled.
Fixes bug 32368; bugfix on 0.2.7.3-rc.
2019-11-05 11:07:31 +10:00
teor
f29de4b8d2
confmgt: Stop adding a space, when there is no option value
...
Fixes bug 32352; bugfix on 0.0.9pre6.
2019-11-05 11:01:28 +10:00
Nick Mathewson
096cbfb8b0
Merge remote-tracking branch 'tor-github/pr/1480'
2019-11-01 09:35:17 -04:00
George Kadianakis
fa0257eda0
Merge branch 'tor-github/pr/1484'
2019-10-31 15:31:14 +08:00
teor
384fe64786
changes: file for 32347
2019-10-31 14:59:23 +10:00
Nick Mathewson
14831ea0ab
Use FILENAME to determine which options to check for relative paths
...
This is part of ticket 32344.
2019-10-30 15:32:12 -04:00
Nick Mathewson
b985cf2403
Use CFLG_IMMUTABLE to replace much of the options transition cb.
...
Closes ticket 32344.
2019-10-30 15:05:26 -04:00
David Goulet
f579541f13
Merge branch 'tor-github/pr/1468'
2019-10-30 08:53:51 -04:00
Neel Chauhan
f81e4aa831
hs-v2: Lookup intro failure cache when picking an intro from descriptor
...
When picking an intro point from the service descriptor, the client failed to
lookup the failure cache.
It made an HS v2 client re-pick bad intro points for which we already know it
won't work in the first place.
Based on Neel Chauhan original patch.
Fixes #25568
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-30 08:47:21 -04:00
Taylor Yu
1e8ddbe1ee
Changes file for ticket 32277
2019-10-29 16:39:03 -05:00
George Kadianakis
4413b98190
Merge branch 'tor-github/pr/1456'
2019-10-29 21:29:13 +08:00
teor
b448f6044d
Merge branch 'maint-0.4.2'
2019-10-29 08:27:02 +10:00
teor
2395800d3e
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-29 08:26:55 +10:00
teor
63aff4a43e
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-29 08:26:48 +10:00
teor
54e2d0dc2d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-29 08:26:40 +10:00
teor
15d67842f9
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-29 08:26:32 +10:00
teor
752c35ca96
Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9
2019-10-29 08:23:35 +10:00
David Goulet
d67db64ced
changes: Add file for ticket 32196
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-28 13:21:08 -04:00
David Goulet
b98631d280
Merge branch 'tor-github/pr/1476'
2019-10-28 08:47:57 -04:00
José M. Guisado
42ba3997d6
Check memunit parsing for overflow in confparse
...
Before, when parsing memunits, if overflow occured it failed silently.
Use nowrap u64 math to detect overflow, compare to INT64_MAX and if
greater tell user and fail accordingly.
15000000.5 TB fails double check as it a greater floating number than
(double)INT64_MAX
8388608.1 TB passes double check because it falls in the same value as
(double)INT64_MAX (which is 2^63), but will fail the int check because
(uint64_t)d, which is 2^63, is strictly greater than 2^63-1 (INT64_MAX).
Fixes #30920
Signed-off-by: José M. Guisado <guigom@riseup.net>
2019-10-28 11:38:41 +01:00
JeremyRand
2734968e40
Bug 19859: Add stream isolation data to STREAM event
2019-10-27 01:32:21 +00:00
Nick Mathewson
bc4b9d7df4
Changes file for ticket 32307.
2019-10-26 12:09:09 -04:00
Nick Mathewson
731464deb5
changes file for 32304
2019-10-26 10:14:05 -04:00
Nick Mathewson
e7993dc046
Merge branch 'ticket31241_v3'
2019-10-25 08:10:39 -04:00
teor
f40eb2ead6
Merge remote-tracking branch 'tor-github/pr/1462'
2019-10-25 16:14:37 +10:00
teor
9be0324c2c
changes: file for 31919
2019-10-25 16:08:44 +10:00
teor
aff286618c
Merge branch 'maint-0.4.2'
2019-10-25 10:56:21 +10:00
teor
d7c40beeab
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-25 10:56:13 +10:00
teor
63581d55a6
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-25 10:56:06 +10:00
teor
e56e7e865e
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-25 10:55:58 +10:00
teor
e03db9934a
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-25 10:55:51 +10:00
teor
a91f52a443
Merge branch 'maint-0.4.2'
2019-10-25 10:38:22 +10:00
Nick Mathewson
94853b4ab6
changes tile for ticket 31241
2019-10-24 20:38:02 -04:00
teor
c8aa3cc17d
Merge remote-tracking branch 'tor-github/pr/1466' into maint-0.4.2
2019-10-25 10:38:01 +10:00
teor
b3d035d5c4
Merge remote-tracking branch 'tor-github/pr/1463'
2019-10-25 10:27:41 +10:00
teor
93be7275ec
changes: file for 31919's bionic Travis image change
2019-10-25 09:53:11 +10:00
teor
c00602cc34
Merge branch 'maint-0.4.2'
2019-10-25 09:42:14 +10:00
teor
acd27f4b41
Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.4.2
2019-10-25 09:41:48 +10:00
Nick Mathewson
fefee871a6
Merge remote-tracking branch 'tor-github/pr/1437'
2019-10-24 11:44:19 -04:00
David Goulet
09468cc58b
dir: Look if circuit is closed in connection_dir_is_anonymous()
...
Before inspecting the p_chan, we must check if the circuit is marked for close
because if it is the case, the channels are nullified from the circuit.
Several valid cases can mark the circuit for close of the directory
connection.
Fixes #31958
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-24 11:08:25 -04:00
David Goulet
ed57a04a65
hs-v3: Remove a BUG() caused by an acceptable race
...
hs_client_purge_state() and hs_cache_clean_as_client() can remove a descriptor
from the client cache with a NEWNYM or simply when the descriptor expires.
Which means that for an INTRO circuit being established during that time, once
it opens, we lookup the descriptor to get the IP object but hey surprised, no
more descriptor.
The approach here is minimalist that is accept the race and close the circuit
since we can not continue. Before that, the circuit would stay opened and the
client wait the SockTimeout.
Fixers #28970 .
Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-24 08:50:01 -04:00
Nick Mathewson
fcdb66acd3
Add a script to rename C identifiers, and optionally add a commit message
...
This script should "pay for itself" if it prevents one bug caused by
careless search-replace-commit loops.
2019-10-24 08:20:31 -04:00
teor
14b197a148
Travis: Use macOS 10.14 with Xcode 11.2
...
Closes ticket 32241.
2019-10-24 11:44:43 +10:00
teor
20606b8a15
Merge remote-tracking branch 'tor-github/pr/1447'
2019-10-24 10:00:47 +10:00
teor
4342486649
Travis: Use zstd in our Travis Linux builds
...
Recent Ubuntu versions have zstd >= 1.1, which is an optional tor build
dependency.
Closes ticket 32242.
2019-10-24 09:26:54 +10:00
