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

32133 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
teor 99b5f1b261 Revert "Travis: Disable all but one macOS build" 
This reverts commit 511aeba8ee.
 2019-11-28 12:10:10 +10:00
teor c88fce1323 Merge branch 'maint-0.4.0' into release-0.4.0 2019-11-25 12:37:03 +10:00
teor 055f5d4d1b Merge branch 'maint-0.3.5' into maint-0.4.0 2019-11-25 12:36:59 +10:00
teor c17ab20ac0 Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.0 2019-11-25 12:36:41 +10:00
teor ed6f2f61a2 Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.0 2019-11-25 12:35:58 +10:00
teor 501b5174d8 Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5 2019-11-25 12:35:11 +10:00
teor 400cee261e Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.3.5 2019-11-25 12:34:29 +10:00
teor 54c01119ed Merge remote-tracking branch 'tor-github/pr/1405' into maint-0.3.5 2019-11-25 12:33:55 +10:00
teor 83424cb62f Merge remote-tracking branch 'tor-github/pr/1395' into maint-0.3.5 2019-11-25 12:33:14 +10:00
teor f9812ee5f7 Merge remote-tracking branch 'tor-github/pr/1394' into maint-0.3.5 2019-11-25 12:29:43 +10:00
Nick Mathewson 76177368c9 Merge branch 'maint-0.4.0' into release-0.4.0 2019-11-11 10:14:04 -05:00
Nick Mathewson 329aa1c48e Merge branch 'maint-0.3.5' into maint-0.4.0 2019-11-11 10:14:03 -05:00
Nick Mathewson 7beaaed245 Merge branch 'maint-0.2.9' into maint-0.3.5 2019-11-11 10:14:03 -05:00
teor c0543ac327 Merge branch 'maint-0.4.0' into release-0.4.0 2019-11-11 14:19:43 +10:00
teor 29940511e3 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-11-11 14:19:39 +10:00