Commit Graph

34779 Commits

Author SHA1 Message Date
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
Nick Mathewson
5d4005abfd Merge remote-tracking branch 'tor-github/pr/1589' 2019-12-09 13:01:24 -05:00
Nick Mathewson
5fea7d8493 Copy forward the changelogs and releasenotes for today's releases.
They are 0.4.2.5, 0.4.1.7, 0.4.0.6, and 0.3.5.9.
2019-12-09 11:55:14 -05:00
Taylor Yu
7bd7089988 changes file for ticket 30984 2019-12-09 09:55:04 -06:00
Taylor Yu
bfe38878b2 Rename control_reply_add_1kv
Part of 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
Taylor Yu
69d56625d1 Doxyfile: skip CHECK_PRINTF()
Part of ticket 30984.
2019-12-08 22:40:00 -06:00
Taylor Yu
9b196f1563 simplify getinfo using reply lines
Simplify handle_control_getinfo() by using the new reply lines
abstraction.  Previously, this function explicitly checked for whether
it should generate a MidReplyLine, a DataReplyLine, or an
EndReplyLine.  control_write_reply_lines() now abstracts this check.

Part of #30984.
2019-12-08 22:40:00 -06:00
Taylor Yu
a08f43ba04 use control reply lines for protocolinfo
Simplify handle_control_protocolinfo() by using the new reply line
abstraction.

Part of #30984.
2019-12-08 22:40:00 -06:00
Taylor Yu
2143bae6c4 refactor handle_control_protocolinfo
Factor out the parts of handle_control_protocolinfo() that assemble
the AUTHMETHODS and COOKIEFILE strings.

Part of #30984.
2019-12-08 22:40:00 -06:00
Taylor Yu
c744d23c8d simplify getconf by using reply lines
In handle_control_getconf(), use the new control reply line
abstraction to simplify output generation.  Previously, this function
explicitly checked for whether it should generate a MidReplyLine or an
EndReplyLine.  control_write_reply_lines() now abstracts this check.

Part of #30984.
2019-12-08 22:40:00 -06:00
Taylor Yu
1a68a18093 reply lines structures
Part of #30984.
2019-12-08 22:40:00 -06:00
Taylor Yu
1e8bb79bbe add KV_RAW to kvline.c
Add the KV_RAW flag to kvline_encode().  This allows generation of
output that is compatible with some quirks of the control protocol.

Part of #30984.
2019-12-08 17:09:43 -06:00
Taylor Yu
4b22c739fe clean up kvline_can_encode_lines()
Add a check for '=' characters in needs_escape().  This simplifies the
logic in kvline_can_encode_lines().

Part of #30984.
2019-12-08 17:09:42 -06: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
39bb283fca Merge branch 'maint-0.4.2'
"ours" to avoid version bump.
2019-12-05 13:32:40 -05:00
Nick Mathewson
0a33522b62 Bump to 0.4.2.5 2019-12-05 13:32:30 -05:00
Nick Mathewson
f8df0f5f32 Merge branch 'maint-0.4.1' into maint-0.4.2
"ours" to avoid version bump.
2019-12-05 13:32:06 -05:00
Nick Mathewson
8933c7908d bump version to 0.4.1.7 2019-12-05 13:31:46 -05:00
Nick Mathewson
db1065403d Merge branch 'maint-0.4.0' into maint-0.4.1
"ours" to avoid version bump.
2019-12-05 13:31:17 -05:00
Nick Mathewson
e66533befa Bump to 0.4.0.6 2019-12-05 13:31:01 -05:00
Nick Mathewson
371d7dbc1a Merge branch 'maint-0.3.5' into maint-0.4.0
"ours" to avoid version bump.
2019-12-05 13:30:32 -05:00
Nick Mathewson
c53567c36f Bump version to 0.3.5.9 2019-12-05 13:29:49 -05: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
Nick Mathewson
9e7cd76e4c Add a missing changelog entry in 0.4.1.6 for the FreeBSD part of 31687 2019-12-05 12:53:01 -05:00
teor
9a556dee81
cocci: Require spatch >= 1.0.4 to run checks
No changes file required: not in any released version of tor.

Fixes bug 32663.
2019-12-05 10:27:47 +10:00
teor
8d616a1a49
Merge branch 'maint-0.4.2' 2019-12-05 10:14:16 +10:00
teor
bb786797aa
Merge branch 'maint-0.4.1' into maint-0.4.2 2019-12-05 10:14:08 +10: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