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
b9269d6d0a
Merge remote-tracking branch 'tor-github/pr/1486'
2019-11-05 14:23:56 +10:00
6169469546
Merge remote-tracking branch 'tor-github/pr/1477'
2019-11-05 14:23:10 +10:00
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
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
96334d6f7f
changes: file for 32213
2019-11-05 11:26:26 +10:00
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
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
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
096cbfb8b0
Merge remote-tracking branch 'tor-github/pr/1480'
2019-11-01 09:35:17 -04:00
fa0257eda0
Merge branch 'tor-github/pr/1484'
2019-10-31 15:31:14 +08:00
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
b985cf2403
Use CFLG_IMMUTABLE to replace much of the options transition cb.
...
Closes ticket 32344.
2019-10-30 15:05:26 -04:00
f579541f13
Merge branch 'tor-github/pr/1468'
2019-10-30 08:53:51 -04:00
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
1e8ddbe1ee
Changes file for ticket 32277
2019-10-29 16:39:03 -05:00
4413b98190
Merge branch 'tor-github/pr/1456'
2019-10-29 21:29:13 +08:00
b448f6044d
Merge branch 'maint-0.4.2'
2019-10-29 08:27:02 +10:00
2395800d3e
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-29 08:26:55 +10:00
63aff4a43e
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-29 08:26:48 +10:00
54e2d0dc2d
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-29 08:26:40 +10:00
15d67842f9
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-29 08:26:32 +10:00
752c35ca96
Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9
2019-10-29 08:23:35 +10:00
d67db64ced
changes: Add file for ticket 32196
...
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-10-28 13:21:08 -04:00
b98631d280
Merge branch 'tor-github/pr/1476'
2019-10-28 08:47:57 -04:00
bc4b9d7df4
Changes file for ticket 32307.
2019-10-26 12:09:09 -04:00
731464deb5
changes file for 32304
2019-10-26 10:14:05 -04:00
e7993dc046
Merge branch 'ticket31241_v3'
2019-10-25 08:10:39 -04:00
f40eb2ead6
Merge remote-tracking branch 'tor-github/pr/1462'
2019-10-25 16:14:37 +10:00
9be0324c2c
changes: file for 31919
2019-10-25 16:08:44 +10:00
aff286618c
Merge branch 'maint-0.4.2'
2019-10-25 10:56:21 +10:00
d7c40beeab
Merge branch 'maint-0.4.1' into maint-0.4.2
2019-10-25 10:56:13 +10:00
63581d55a6
Merge branch 'maint-0.4.0' into maint-0.4.1
2019-10-25 10:56:06 +10:00
e56e7e865e
Merge branch 'maint-0.3.5' into maint-0.4.0
2019-10-25 10:55:58 +10:00
e03db9934a
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-10-25 10:55:51 +10:00
a91f52a443
Merge branch 'maint-0.4.2'
2019-10-25 10:38:22 +10:00
94853b4ab6
changes tile for ticket 31241
2019-10-24 20:38:02 -04:00
c8aa3cc17d
Merge remote-tracking branch 'tor-github/pr/1466' into maint-0.4.2
2019-10-25 10:38:01 +10:00
b3d035d5c4
Merge remote-tracking branch 'tor-github/pr/1463'
2019-10-25 10:27:41 +10:00
93be7275ec
changes: file for 31919's bionic Travis image change
2019-10-25 09:53:11 +10:00
c00602cc34
Merge branch 'maint-0.4.2'
2019-10-25 09:42:14 +10:00
acd27f4b41
Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.4.2
2019-10-25 09:41:48 +10:00
fefee871a6
Merge remote-tracking branch 'tor-github/pr/1437'
2019-10-24 11:44:19 -04:00
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
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
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
14b197a148
Travis: Use macOS 10.14 with Xcode 11.2
...
Closes ticket 32241.
2019-10-24 11:44:43 +10:00
20606b8a15
Merge remote-tracking branch 'tor-github/pr/1447'
2019-10-24 10:00:47 +10:00
b6c24eb484
hs-v3: Remove the circuit_established intro flag
...
Only use the HS circuit map to know if an introduction circuit is established
or not. No need for a flag to keep state of something we already have in the
circuit map. Furthermore, the circuit map gets cleaned up properly so it will
always have the "latest truth".
This commit also removes a unit test that was testing specifically that flag
but now we rely solely on the HS circuit map which is also tested few lines
below the removed test.
Fixes #32094
Signed-off-by: David Goulet <dgoulet@torproject.org >
2019-10-23 11:51:23 -04:00
9586ae178a
Merge branch 'tor-github/pr/1451'
2019-10-23 09:11:43 -04:00
teor
Nick Mathewson
George Kadianakis
David Goulet
Neel Chauhan
Taylor Yu