torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
34,500 Commits 53 Branches 631 Tags
b6f099672b90cb606d89bfcb0cae01ea49e46b9c
Commit Graph

8951 Commits

Author SHA1 Message Date
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 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.

From a security perspective, I don't think this should impact the
security of the sandbox significantly. As far as I can tell, there
is nothing an adversary can do with a duplicated FD that can't be
done with the original.
 2020-01-05 15:24:45 +00: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
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
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