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

33853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 f86d508d49 changes: file for 32629 2019-12-06 10:52:19 +10: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 cb51b0d55e Merge branch 'maint-0.4.2' into release-0.4.2 2019-12-05 13:33:05 -05:00
Nick Mathewson 0a33522b62 Bump to 0.4.2.5 2019-12-05 13:32:30 -05:00
Nick Mathewson f8df0f5f32 Merge branch 'maint-0.4.1' into maint-0.4.2 
"ours" to avoid version bump.
 2019-12-05 13:32:06 -05:00
Nick Mathewson 8933c7908d bump version to 0.4.1.7 2019-12-05 13:31:46 -05:00
Nick Mathewson db1065403d Merge branch 'maint-0.4.0' into maint-0.4.1 
"ours" to avoid version bump.
 2019-12-05 13:31:17 -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 9b2d870292 Start releasenotes for 0.4.2.5 2019-12-05 13:25:52 -05:00
Nick Mathewson a0f80026d0 start on changelog for 0.4.2.5 2019-12-05 12:18:50 -05:00
teor 24e6251b81 Merge branch 'maint-0.4.2' into release-0.4.2 2019-12-05 10:14:12 +10:00
teor bb786797aa Merge branch 'maint-0.4.1' into maint-0.4.2 2019-12-05 10:14:08 +10:00
teor cfa9cc34aa Merge branch 'maint-0.4.0' into maint-0.4.1 2019-12-05 10:14:01 +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 df9a1f3137 Merge branch 'maint-0.4.2' into release-0.4.2 2019-12-03 12:47:02 +10:00
teor 3207a8e5c2 Merge branch 'maint-0.4.1' into maint-0.4.2 2019-12-03 12:46:58 +10:00
teor 14089a29b5 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-12-03 12:46:50 +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 4a157c7569 Merge branch 'ticket32629_041' into ticket32629_042 
Merge RUST_VERSION from maint-0.4.2 with disabling the macOS Rust
job from ticket32629_041.
 2019-12-01 20:28:44 +10:00