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
32,150 Commits 53 Branches 631 Tags
d0d2aba9f32fd6725f84f5d8a91ef6798e3dbb73
Commit Graph

32150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
teor d0d2aba9f3 Merge branch 'maint-0.4.0' into release-0.4.0 2020-01-30 07:55:01 +10:00
teor 65825018c7 Merge branch 'maint-0.3.5' into maint-0.4.0 2020-01-30 07:54:58 +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 8e3e8b0a1c Merge branch 'maint-0.4.0' into release-0.4.0 2020-01-16 10:00:36 +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
teor 262906e994 Merge branch 'maint-0.4.0' into release-0.4.0 2019-12-20 10:12:39 +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 c4eb6740f9 Merge branch 'maint-0.4.0' into release-0.4.0 2019-12-16 08:16:08 +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 793c4a3c92 Merge branch 'maint-0.4.0' into release-0.4.0 2019-12-09 16:04:22 -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 39344e410d Copy ChangeLog to ReleaseNotes. tor-0.4.0.6 2019-12-09 11:50:51 -05:00
Nick Mathewson 6ccb9bc8b9 Pick a release date. 2019-12-09 11:12:25 -05:00
Nick Mathewson 6f615ee205 update changelog for new geoip entry. 2019-12-06 16:05:47 -05:00
Nick Mathewson 4de31504b0 Merge branch 'maint-0.4.0' into release-0.4.0 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 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 c3a3539da8 Merge branch 'maint-0.4.0' into release-0.4.0 2019-12-05 13:33:04 -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 948e9bf6c1 Start a changelog for 0.4.0.6 2019-12-05 12:50:18 -05:00
teor aa47cb6e0f Merge branch 'maint-0.4.0' into release-0.4.0 2019-12-05 10:13:57 +10:00
teor 92fb099067 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-12-05 10:13:53 +10:00
teor 46057ec5ae Merge remote-tracking branch 'tor-github/pr/1424' into maint-0.4.0 2019-12-05 10:13:15 +10:00
teor aee966cb06 Merge remote-tracking branch 'tor-github/pr/1277' into maint-0.3.5 2019-12-05 10:11:18 +10:00
teor 03dc0e19a1 Merge branch 'maint-0.4.0' into release-0.4.0 2019-12-03 12:46:47 +10:00
teor febbc236d4 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-12-03 12:46:43 +10:00
teor 62cf12a8bd Travis: use -std=gnu99 with NSS, and clang with Chutney 
NSS:
* test NSS-specific code with -std=gnu99
* use a recent gcc version from the latest Ubuntu image

Chutney:
* use clang, so we keep one clang Linux job
* keep clang on a fast job, so the overall build finishes quickly

Closes ticket 32500 for 0.3.5.
 2019-12-03 12:46:22 +10:00
teor 145ff92d92 Merge branch 'maint-0.2.9' into maint-0.3.5 
Merge C_DIALECT_OPTIONS from ticket32500_029 with
other configure options from maint-0.3.5.
 2019-12-03 12:45:41 +10:00
teor 792c15fde2 Travis: use -std=gnu99 in some jobs 
Require C99 standards-conforming code in Travis CI, but allow GNU gcc
extensions. Also activates clang's -Wtypedef-redefinition warnings.

Builds some jobs with -std=gnu99, and some jobs without.

Closes ticket 32500.
 2019-12-03 12:42:39 +10:00
teor 6558bb4460 Travis: Disable the macOS Rust job 
This time, we're disabling it because it's the lowest priority job.
(And also slow.)

Part of 32629.
 2019-12-01 20:25:00 +10:00
teor f2f7491cd9 Merge branch 'ticket32629_029' into ticket32629_035 
Merge re-enable chutney from ticket32629_029 with
stem from maint-0.3.5.
 2019-11-28 12:21:08 +10:00
teor 453e092e52 Revert "Travis: Disable the Rust macOS build" 
This reverts commit 4c4a0d50ff.
 2019-11-28 12:11:37 +10:00