aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-02-10Merge branch 'maint-0.4.0' into release-0.4.0release-0.4.0Nick Mathewson
2020-02-10Merge branch 'maint-0.3.5' into maint-0.4.0maint-0.4.0Nick Mathewson
2020-02-10Merge branch 'bug33212_035' into maint-0.3.5Nick Mathewson
2020-02-10Fix a Rust compilation warning; resolve bug 33212.Nick Mathewson
2020-01-30Merge branch 'maint-0.4.0' into release-0.4.0teor
2020-01-30Merge branch 'maint-0.3.5' into maint-0.4.0teor
2020-01-30Merge remote-tracking branch 'tor-github/pr/1614' into maint-0.3.5teor
2020-01-16Merge branch 'maint-0.4.0' into release-0.4.0teor
2020-01-16Merge branch 'maint-0.3.5' into maint-0.4.0teor
2020-01-16Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.3.5teor
2019-12-20Merge branch 'maint-0.4.0' into release-0.4.0teor
2019-12-17Correct how we use libseccompPeter Gerber
This fixes a startup crash with libseccomp v2.4.0 if Sandbox is set to 1.
2019-12-16Merge branch 'bug32240_32242_035' into bug32240_32242_040teor
Merge: * libzstd-dev from ticket32242_035 * shellcheck from maint-0.4.0
2019-12-16Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035teor
2019-12-16Merge branch 'bug32240_035' into bug32240_040teor
2019-12-16Merge branch 'bug32240_029' into bug32240_035teor
Merge * Chutney Trusty deletion in bug32240_029 * NSS addition in maint-0.3.5
2019-12-16changes: file for 32240maint-0.2.9teor
2019-12-16Travis: Run Chutney jobs in Ubuntu Bionic imagesteor
Closes 32240.
2019-12-16Travis: Turn off Tor's Sandbox in Chutney jobsteor
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-16Merge branch 'maint-0.4.0' into release-0.4.0teor
2019-12-16Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-12-16Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-12-16Merge remote-tracking branch 'tor-github/pr/1576' into maint-0.3.5teor
2019-12-16Merge remote-tracking branch 'tor-github/pr/1575' into maint-0.2.9teor
2019-12-09Merge branch 'maint-0.4.0' into release-0.4.0Nick Mathewson
2019-12-09Bump version to 0.4.0.6-devNick Mathewson
2019-12-09Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
"ours" to avoid version bump.
2019-12-09bump to 0.3.5.9-devNick Mathewson
2019-12-09Copy ChangeLog to ReleaseNotes.tor-0.4.0.6Nick Mathewson
2019-12-09Pick a release date.Nick Mathewson
2019-12-06update changelog for new geoip entry.Nick Mathewson
2019-12-06Merge branch 'maint-0.4.0' into release-0.4.0Nick Mathewson
2019-12-06Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-12-06Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
2019-12-06Update geoip and geoip6 to the December 3 2019 database.Karsten Loesing
2019-12-06changes: file for 32629teor
2019-12-06changes: file for 32629teor
2019-12-05Merge branch 'maint-0.4.0' into release-0.4.0Nick Mathewson
2019-12-05Bump to 0.4.0.6Nick Mathewson
2019-12-05Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
"ours" to avoid version bump.
2019-12-05Bump version to 0.3.5.9Nick Mathewson
2019-12-05Start a changelog for 0.4.0.6Nick Mathewson
2019-12-05Merge branch 'maint-0.4.0' into release-0.4.0teor
2019-12-05Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-12-05Merge remote-tracking branch 'tor-github/pr/1424' into maint-0.4.0teor
2019-12-05Merge remote-tracking branch 'tor-github/pr/1277' into maint-0.3.5teor
2019-12-03Merge branch 'maint-0.4.0' into release-0.4.0teor
2019-12-03Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-12-03Travis: use -std=gnu99 with NSS, and clang with Chutneyteor
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-03Merge branch 'maint-0.2.9' into maint-0.3.5teor
Merge C_DIALECT_OPTIONS from ticket32500_029 with other configure options from maint-0.3.5.