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
37,019 Commits 53 Branches 631 Tags
af602fff9fe68d6f90aca86583d91a495d00954b
Commit Graph

37019 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson af602fff9f Merge branch 'maint-0.4.5' into release-0.4.5 2021-06-07 13:32:36 -04:00
Nick Mathewson c80b98520b Bump to 0.4.5.9. 2021-06-07 13:31:10 -04:00
Nick Mathewson b3ca2faf46 Merge branch 'maint-0.4.4' into maint-0.4.5 
"ours" to avoid version bump.
 2021-06-07 13:30:36 -04:00
Nick Mathewson 1956f63d6b Bump to 0.4.4.9 2021-06-07 13:30:18 -04:00
Nick Mathewson 6bcb0fb881 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-06-07 13:29:49 -04:00
Nick Mathewson ed7f4ad4a9 Bump to 0.3.5.15. 2021-06-07 13:29:35 -04:00
Nick Mathewson f8d028e14a Merge branch 'maint-0.4.5' into release-0.4.5 2021-05-28 08:03:43 -04:00
Nick Mathewson 8b6e919086 Stop using the "x$FOO" idiom in git-resquash.sh 
The new version of shellcheck says that that this idiom is
unnecessary, and its presence here is making the shellcheck tests
fail.

No changes file needed, since this is not user-facing code.
 2021-05-28 08:02:08 -04:00
Alexander Færøy 11c7e65730 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-05-25 13:25:23 +00:00
Alexander Færøy 6d11a0c61f Merge branch 'maint-0.4.5' into release-0.4.5 2021-05-25 13:25:23 +00:00
Alexander Færøy 4a7379b80a Merge branch 'maint-0.4.4' into maint-0.4.5 2021-05-25 13:25:23 +00:00
Nick Mathewson 42ba87d964 Remove the function tor_tls_assert_renegotiation_unblocked. 
It was used nowhere outside its own unit tests, and it was causing
compilation issues with recent OpenSSL 3.0.0 alphas.

Closes ticket 40399.
 2021-05-25 07:38:31 -04:00
Nick Mathewson e7f6015be8 Merge branch 'maint-0.4.5' into release-0.4.5 2021-05-17 09:09:49 -04:00
Nick Mathewson 97b61e21a9 Merge remote-tracking branch 'tor-gitlab/mr/387' into maint-0.4.5 2021-05-17 09:09:42 -04:00
Nick Mathewson 61f847d4bd Merge branch 'maint-0.4.5' into release-0.4.5 2021-05-17 09:04:22 -04:00
Daniel Pinto e0a8454691 Make SAVECONF keep only one backup and add sandbox rules for it. #40317 
When seccomp sandbox is active, SAVECONF failed because it was not
able to save the backup files for torrc. This commit simplifies
the implementation of SAVECONF and sandbox by making it keep only
one backup of the configuration file.
 2021-05-17 13:50:19 +02:00
David Goulet 5f009a59da conn: MetricsPort listener is a listener port 
The connection type for the listener part was missing from the "is
connection a listener" function.

This lead to our periodic event that retries our listeners to keep
trying to bind() again on an already opened MetricsPort.

Closes #40370

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2021-05-12 15:13:50 -04:00
Nick Mathewson 9521c3e7be Merge branch 'maint-0.4.5' into release-0.4.5 2021-05-10 10:55:16 -04:00
Nick Mathewson ce8d6d143c Update to 0.4.5.8-dev 2021-05-10 10:53:00 -04:00
Nick Mathewson 0fd0f45761 Copy 0.4.5.8 changelog into releasenotes 2021-05-10 10:12:30 -04:00
Nick Mathewson 27e5e33d2c Fold in the last-minute fixes (0.4.5) tor-0.4.5.8 2021-05-07 13:11:00 -04:00
Nick Mathewson 671b05edfc Merge branch 'maint-0.4.5' into release-0.4.5 2021-05-07 13:08:25 -04:00
Nick Mathewson d85ef0d5e0 Merge branch 'ticket40382_045' into maint-0.4.5 2021-05-07 13:08:14 -04:00
Nick Mathewson f5acfe6723 Add a sandbox workaround for Glibc 2.33 
This change permits the newfstatat() system call, and fixes issues
40382 (and 40381).

This isn't a free change.  From the commit:

    // Libc 2.33 uses this syscall to implement both fstat() and stat().
    //
    // The trouble is that to implement fstat(fd, &st), it calls:
    //     newfstatat(fs, "", &st, AT_EMPTY_PATH)
    // We can't detect this usage in particular, because "" is a pointer
    // we don't control.  And we can't just look for AT_EMPTY_PATH, since
    // AT_EMPTY_PATH only has effect when the path string is empty.
    //
    // So our only solution seems to be allowing all fstatat calls, which
    // means that an attacker can stat() anything on the filesystem. That's
    // not a great solution, but I can't find a better one.
 2021-05-07 12:12:11 -04:00
Nick Mathewson 03f1983c63 Merge branch 'maint-0.4.5' into release-0.4.5 2021-05-07 10:41:34 -04:00
Nick Mathewson 7c86f34340 Merge branch 'maint-0.4.4' into maint-0.4.5 2021-05-07 10:41:34 -04:00
Nick Mathewson 48dd87933d Merge branch 'maint-0.3.5' into maint-0.4.4 2021-05-07 10:41:33 -04:00
Nick Mathewson e2c1ac214c Reindent a few lines to fix a GCC warning. 
As of GCC 11.1.1, the compiler warns us about code like this:

     if (a)
         b;
         c;

and that's a good thing: we wouldn't want to "goto fail".  But we
had an instance if this in circuituse.c, which was making our
compilation sad.

Fixes bug 40380; bugfix on 0.3.0.1-alpha.
 2021-05-07 10:39:20 -04:00
Nick Mathewson 489d18508c Start a changelog for 0.4.5.8 2021-05-07 10:02:59 -04:00
Nick Mathewson 7fe819c951 Merge branch 'maint-0.4.4' into maint-0.4.5 2021-05-07 09:53:58 -04:00
Nick Mathewson 4b31516b14 Merge branch 'maint-0.4.5' into release-0.4.5 2021-05-07 09:53:58 -04:00
Nick Mathewson f68aeda549 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-05-07 09:53:57 -04:00
Nick Mathewson 621f8a304a Update geoip files to match ipfire location db, 2021/05/07. 2021-05-07 09:53:46 -04:00
Nick Mathewson 29ed93d92f Merge branch 'maint-0.4.5' into release-0.4.5 2021-05-07 09:44:04 -04:00
Nick Mathewson ec0b4bdafd Bump to 0.4.5.8. 2021-05-07 09:39:33 -04:00
David Goulet 7aa75d0738 Merge branch 'maint-0.4.5' into release-0.4.5 2021-05-07 08:49:34 -04:00
George Kadianakis 80c404c4b7 Log warning when connecting to soon-to-be-deprecated v2 onions. 2021-05-07 08:44:36 -04:00
George Kadianakis 13fd8f362f Merge branch 'maint-0.4.5' into release-0.4.5 2021-04-23 13:00:23 +03:00
David Goulet 8c29729916 hs: Fix memory leak in client cache 
Fixes #40356

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2021-04-21 11:37:46 -04:00
Nick Mathewson 792151e4f4 Merge branch 'maint-0.4.5' into release-0.4.5 2021-04-21 10:34:28 -04:00
Nick Mathewson a4a3721690 Merge branch 'maint-0.4.4' into maint-0.4.5 2021-04-21 10:34:28 -04:00
Nick Mathewson 87d96f7162 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-04-21 10:34:14 -04:00
George Kadianakis 32eea3b006 Merge remote-tracking branch 'tor-gitlab/mr/363' into maint-0.3.5 2021-04-21 16:48:22 +03:00
Nick Mathewson e6ef22ca15 Merge branch 'maint-0.4.5' into release-0.4.5 2021-04-19 11:30:00 -04:00
Nick Mathewson cd75eac743 Tweak changes/ticket40369 to be a bug. 2021-04-19 11:29:46 -04:00
Emery Hemingway f47c6c3d1b scripts/build/combine_libs: use $AR rather than ar 
Using a custom ar at $AR may be necessary for cross-compilation.

Closes #40369

Signed-off-by: David Goulet <dgoulet@torproject.org>
 2021-04-19 11:28:20 -04:00
George Kadianakis 2fc077e676 Merge branch 'maint-0.4.5' into release-0.4.5 2021-04-19 17:33:45 +03:00
George Kadianakis 925ec0e0ea Merge remote-tracking branch 'tor-gitlab/mr/355' into maint-0.4.5 2021-04-19 17:32:56 +03:00
David Goulet eddb3e262e Merge branch 'maint-0.4.5' into release-0.4.5 2021-04-14 08:39:17 -04:00
David Goulet bba3393d20 Merge branch 'maint-0.3.5' into maint-0.4.4 2021-04-14 08:39:16 -04:00