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,086 Commits 53 Branches 631 Tags
f9e73a923e0734cbffbc20cea75cf59fe059f53e
Commit Graph

33086 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson f9e73a923e Merge branch 'maint-0.4.1' into release-0.4.1 2020-02-11 08:53:41 -05:00
Nick Mathewson 0ff3e8f4a0 Remove a redundant practracker exception line in maint-0.4.1 
This will our "git push" hook not complain about pushing from
maint-0.4.1.
 2020-02-11 08:52:26 -05:00
Nick Mathewson d2cbefbb8f Merge branch 'maint-0.4.1' into release-0.4.1 2020-02-10 14:17:10 -05:00
Nick Mathewson 71c49f7356 Merge branch 'maint-0.4.0' into maint-0.4.1 2020-02-10 14:17:10 -05:00
Nick Mathewson f3fa22bf1b Merge branch 'maint-0.3.5' into maint-0.4.0 2020-02-10 14:17:09 -05:00
Nick Mathewson 2b6df3da21 Merge branch 'bug33212_035' into maint-0.3.5 2020-02-10 14:17:03 -05:00
Nick Mathewson 99d044d553 Fix a Rust compilation warning; resolve bug 33212. 2020-02-10 13:32:09 -05:00
Nick Mathewson 06df2f51d7 Merge branch 'maint-0.4.1' into release-0.4.1 2020-01-30 11:19:55 -05:00
Nick Mathewson 7afb95d3e3 Bump to 0.4.1.8-dev 2020-01-30 11:18:50 -05:00
Nick Mathewson de79264c1d 0.4.1.8: copy changelog to release notes. tor-0.4.1.8 2020-01-30 10:04:07 -05:00
Nick Mathewson f644ff8dbb 0.4.1.8: fix year and pick a release date. 2020-01-30 10:02:53 -05:00
Nick Mathewson 84aa01aecb Changelog for 0.4.1.8 2020-01-29 20:06:15 -05:00
Nick Mathewson 3090839168 Merge branch 'maint-0.4.1' into release-0.4.1 2020-01-29 19:44:48 -05:00
Nick Mathewson ec7f99e6ef bump to 0.4.1.8 2020-01-29 19:42:24 -05:00
teor d211b20fbf Merge branch 'maint-0.4.1' into release-0.4.1 2020-01-30 07:55:09 +10:00
teor 6b392c333a Merge branch 'maint-0.4.0' into maint-0.4.1 2020-01-30 07:55:05 +10:00
teor 65825018c7 Merge branch 'maint-0.3.5' into maint-0.4.0 2020-01-30 07:54:58 +10:00
teor 9b0b2aef80 Merge remote-tracking branch 'tor-github/pr/1634' into maint-0.4.1 2020-01-30 07:54:39 +10:00
teor 41d52e9cd8 Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5 2020-01-30 07:53:53 +10:00
teor 2be3b82750 Merge branch 'maint-0.4.1' into release-0.4.1 2020-01-16 10:00:44 +10:00
teor fb541ffca3 Merge branch 'maint-0.4.0' into maint-0.4.1 2020-01-16 10:00:40 +10:00
teor 026f068bb3 Merge branch 'maint-0.3.5' into maint-0.4.0 2020-01-16 10:00:32 +10:00
teor 19954cffd7 Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5 2020-01-16 09:57:27 +10:00
Nick Mathewson 54eec5342d Initialize publish/subscribe code when running as an NT service. 
Fixes bug 32778; bugfix on 0.4.1.1-alpha.
 2020-01-06 09:22:57 -05:00
Nick Mathewson bdc870e6f5 Merge branch 'maint-0.4.1' into release-0.4.1 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 8b685622f8 Merge branch 'maint-0.4.1' into release-0.4.1 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 69d7ea4db9 Merge branch 'maint-0.4.1' into release-0.4.1 2019-12-20 10:12:47 +10:00
teor 7237637871 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-12-20 10:12:43 +10: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
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 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 7c2e1f6ddd Merge branch 'maint-0.4.1' into release-0.4.1 2019-12-16 08:16:16 +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 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 9fc50f0574 Merge branch 'maint-0.4.1' into release-0.4.1 2019-12-09 16:04:22 -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