ec454830e7
Merge branch 'maint-0.3.5' into release-0.3.5
2020-02-10 14:17:09 -05:00
2b6df3da21
Merge branch 'bug33212_035' into maint-0.3.5
2020-02-10 14:17:03 -05:00
99d044d553
Fix a Rust compilation warning; resolve bug 33212.
2020-02-10 13:32:09 -05:00
c3e300dc9c
Merge branch 'maint-0.3.5' into release-0.3.5
2020-01-30 07:54:54 +10:00
41d52e9cd8
Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5
2020-01-30 07:53:53 +10:00
792172ffec
Merge branch 'maint-0.3.5' into release-0.3.5
2020-01-16 10:00:28 +10:00
19954cffd7
Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5
2020-01-16 09:57:27 +10:00
23e1c1c35c
Merge branch 'maint-0.3.5' into release-0.3.5
2019-12-20 10:12:35 +10:00
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
0b3763612c
Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035
2019-12-16 09:21:05 +10:00
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
37b04aeed7
changes: file for 32240
2019-12-16 09:06:25 +10:00
0f07d25243
Travis: Run Chutney jobs in Ubuntu Bionic images
...
Closes 32240.
2019-12-16 09:03:48 +10:00
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
28e708fcbc
Merge branch 'maint-0.3.5' into release-0.3.5
2019-12-16 08:16:00 +10:00
1cd20ff848
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-12-16 08:15:55 +10:00
05908d57f6
Merge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5
2019-12-16 08:14:04 +10:00
7dd5946094
Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9
2019-12-16 08:13:38 +10:00
09a3bd1ffe
Merge branch 'maint-0.3.5' into release-0.3.5
2019-12-09 16:04:22 -05:00
0c4f0ec977
bump to 0.3.5.9-dev
2019-12-09 16:01:11 -05:00
72595eb021
Copy ChangeLog to ReleaseNotes.
2019-12-09 11:53:29 -05:00
c00c24a400
Pick a release date.
2019-12-09 11:12:37 -05:00
e0920a3f63
changelog: new geoip entry.
2019-12-06 16:04:19 -05:00
74cae547e5
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-12-06 16:02:07 -05:00
289adbce58
Merge branch 'maint-0.3.5' into release-0.3.5
2019-12-06 16:02:07 -05:00
b7b467d3af
Update geoip and geoip6 to the December 3 2019 database.
2019-12-06 11:50:35 +01:00
a277f28947
changes: file for 32629
2019-12-06 10:51:43 +10:00
b84e7715da
changes: file for 32629
2019-12-06 10:51:05 +10:00
bd664bca96
Merge branch 'maint-0.3.5' into release-0.3.5
2019-12-05 13:33:04 -05:00
c53567c36f
Bump version to 0.3.5.9
2019-12-05 13:29:49 -05:00
0844460589
Start a changelog for 0.3.5.9
2019-12-05 13:18:15 -05:00
c64844243a
Merge branch 'maint-0.3.5' into release-0.3.5
2019-12-05 10:13:49 +10:00
aee966cb06
Merge remote-tracking branch 'tor-github/pr/1277' into maint-0.3.5
2019-12-05 10:11:18 +10:00
4ded6981be
Merge branch 'maint-0.3.5' into release-0.3.5
2019-12-03 12:46:39 +10:00
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
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
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
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
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
453e092e52
Revert "Travis: Disable the Rust macOS build"
...
This reverts commit 4c4a0d50ff
2019-11-28 12:11:37 +10:00
99b5f1b261
Revert "Travis: Disable all but one macOS build"
...
This reverts commit 511aeba8ee
2019-11-28 12:10:10 +10:00
90b8c21671
Merge branch 'maint-0.3.5' into release-0.3.5
2019-11-25 12:36:53 +10:00
501b5174d8
Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5
2019-11-25 12:35:11 +10:00
400cee261e
Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.3.5
2019-11-25 12:34:29 +10:00
54c01119ed
Merge remote-tracking branch 'tor-github/pr/1405' into maint-0.3.5
2019-11-25 12:33:55 +10:00
83424cb62f
Merge remote-tracking branch 'tor-github/pr/1395' into maint-0.3.5
2019-11-25 12:33:14 +10:00
f9812ee5f7
Merge remote-tracking branch 'tor-github/pr/1394' into maint-0.3.5
2019-11-25 12:29:43 +10:00
d1bd198686
Merge branch 'maint-0.3.5' into release-0.3.5
2019-11-11 10:14:03 -05:00
7beaaed245
Merge branch 'maint-0.2.9' into maint-0.3.5
2019-11-11 10:14:03 -05:00
58046be102
Merge branch 'maint-0.3.5' into release-0.3.5
2019-11-11 14:19:34 +10:00
Nick Mathewson
teor
Peter Gerber
Karsten Loesing