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
33,832 Commits 53 Branches 631 Tags
afa4cc57bf101eb3effbd233fc3d18265279fe8e
Commit Graph

33832 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
teor afa4cc57bf Merge branch 'maint-0.4.2' into release-0.4.2 2020-01-14 17:41:40 +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
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 f1173a63fb Merge branch 'maint-0.4.2' into release-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 77188ef36e Merge branch 'maint-0.4.2' into release-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 7b7aa4f070 Merge branch 'maint-0.4.2' into release-0.4.2 2020-01-06 08:06:54 -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
teor 664a2c0755 Merge branch 'maint-0.4.2' into release-0.4.2 2019-12-20 10:12:55 +10:00
teor 5dbb607e94 Merge branch 'maint-0.4.1' into maint-0.4.2 2019-12-20 10:12:51 +10:00
teor 7237637871 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-12-20 10:12:43 +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
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 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 0f07d25243 Travis: Run Chutney jobs in Ubuntu Bionic images 
Closes 32240.
 2019-12-16 09:03:48 +10:00
teor 704f3224a2 Travis: Turn off Tor's Sandbox in Chutney jobs 
We need to set "Sandbox 0", until we fix sandbox errors that are
triggered by Ubuntu Xenial and Bionic. See 32722.

Part of 32240.
 2019-12-16 09:01:45 +10:00
teor d5702a6340 Merge branch 'maint-0.4.2' into release-0.4.2 2019-12-16 08:16:24 +10:00
teor bd11fb1096 Merge branch 'maint-0.4.1' into maint-0.4.2 2019-12-16 08:16:20 +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 1cd20ff848 Merge branch 'maint-0.2.9' into maint-0.3.5 2019-12-16 08:15:55 +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
Nick Mathewson ee4375a985 Merge branch 'maint-0.4.2' into release-0.4.2 2019-12-09 16:04:22 -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 bede4ea100 Pick a release date, write a blurb. tor-0.4.2.5 2019-12-09 11:11:47 -05:00
Nick Mathewson ad9bcbfc87 update changelog for new geoip entry. 2019-12-06 16:06:01 -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 8646b4dde7 Merge branch 'maint-0.4.2' into release-0.4.2 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