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,056 Commits 53 Branches 631 Tags
69d7ea4db963155e6133bc724d4639ea1bd31d1c
Commit Graph
8548 Commits
Author SHA1 Message Date
teor 69d7ea4db9 Merge branch 'maint-0.4.1' into release-0.4.1 2019-12-20 10:12:47 +10:00
teor 7237637871 Merge branch 'maint-0.4.0' into maint-0.4.1 2019-12-20 10:12:43 +10: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 7c2e1f6ddd Merge branch 'maint-0.4.1' into release-0.4.1 2019-12-16 08:16:16 +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 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 efd6864d39 update changelog for new geoip entry. 2019-12-06 16:05:53 -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 c030d2cbc0 Merge branch 'maint-0.4.1' into release-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
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 1e218d7360 Start a changelog for 0.4.1.7 2019-12-05 12:21:40 -05:00
teor 2ef4c04a92 Merge branch 'maint-0.4.1' into release-0.4.1 2019-12-05 10:14:05 +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 82cef8032b Merge branch 'maint-0.4.1' into release-0.4.1 2019-12-03 12:46:54 +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 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 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 99b5f1b261 Revert "Travis: Disable all but one macOS build" 
This reverts commit 511aeba8ee.
 2019-11-28 12:10:10 +10:00
teor 28c05e0ecf Merge branch 'maint-0.4.1' into release-0.4.1 2019-11-25 12:37:11 +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
Nick Mathewson 108cd4965e Merge branch 'maint-0.4.1' into release-0.4.1 2019-11-11 10:14:04 -05:00
Nick Mathewson 29eb7b07ef Merge branch 'maint-0.4.0' into maint-0.4.1 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 06bbcbe45b Merge branch 'maint-0.4.1' into release-0.4.1 2019-11-11 14:19:51 +10:00
teor 7043be968a Merge branch 'maint-0.4.0' into maint-0.4.1 2019-11-11 14:19:47 +10:00
teor 29940511e3 Merge branch 'maint-0.3.5' into maint-0.4.0 2019-11-11 14:19:39 +10:00