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

33777 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 8646b4dde7 Merge branch 'maint-0.4.2' into release-0.4.2 2019-12-06 16:02:08 -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 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
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 189287e7bc Merge branch 'maint-0.4.2' into release-0.4.2 2019-11-25 12:50:59 +10:00
teor eb81704081 CodingStandards: Use consistent spacing 
* 2 newlines before ====== headers
* 1 newline before ------ headers
 2019-11-25 12:50:15 +10:00
teor aa73b30dfa Merge branch 'maint-0.4.2' into release-0.4.2 2019-11-25 12:37:21 +10:00
teor 3d6545250e Merge branch 'maint-0.4.1' into maint-0.4.2 2019-11-25 12:37:15 +10:00
teor 26071aa3be Merge branch 'maint-0.4.0' into maint-0.4.1 2019-11-25 12:37:07 +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
teor 969ee5d77f CodingStandards: Use the correct changes file format 
And remove a duplicate description of the format.

Obviously correct changes to documentation.
 2019-11-25 11:44:22 +10:00
Nick Mathewson 7f43d24e07 Merge branch 'maint-0.4.2' into release-0.4.2 2019-11-15 08:06:50 -05:00
Nick Mathewson 6d81ca845c bump version to 0.4.2.4-rc-dev 2019-11-15 08:06:09 -05:00
Nick Mathewson 6a490d3032 pick a release date. tor-0.4.2.4-rc 2019-11-15 07:25:12 -05:00
Nick Mathewson 086b81cb08 more blurb for 0.4.2.4-rc changelog. 2019-11-12 16:46:54 -05:00
Nick Mathewson e3e25c09b7 Minor edits and sorting on 0.4.2.4-rc changelog 2019-11-12 16:46:14 -05:00