summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-01-06Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2020-01-05Fix sandbox crash during reload of logging configurationPeter Gerber
Allow calls to dup() which was introduced in commit a22fbab986. From a security perspective, I don't think this should impact the security of the sandbox significantly. As far as I can tell, there is nothing an adversary can do with a duplicated FD that can't be done with the original.
2019-12-20Merge branch 'maint-0.4.1' into maint-0.4.2teor
2019-12-20Merge branch 'maint-0.4.0' into maint-0.4.1teor
2019-12-16Merge branch 'bug32240_32242_041' into bug32240_32242_042teor
2019-12-16Merge branch 'bug32240_32242_040' into bug32240_32242_041teor
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_041' into bug32240_042teor
Merge: * CHUTNEY_TOR_SANDBOX=0 from bug32240_041 * RUST_VERSION from maint-0.4.2
2019-12-16Merge branch 'bug32240_040' into bug32240_041teor
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.1' into maint-0.4.2teor
2019-12-16Merge branch 'maint-0.4.0' into maint-0.4.1teor
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/1577' into maint-0.4.2teor
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-09bump to 0.4.2.5-devNick Mathewson
2019-12-09Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
"ours" to avoid version bump.
2019-12-09bump to 0.4.1.7-devNick Mathewson
2019-12-09Merge branch 'maint-0.4.0' into maint-0.4.1Nick 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-06Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-12-06Merge branch 'maint-0.4.0' into maint-0.4.1Nick 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-06changes: file for 32629teor
2019-12-05Bump to 0.4.2.5Nick Mathewson
2019-12-05Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
"ours" to avoid version bump.
2019-12-05bump version to 0.4.1.7Nick Mathewson
2019-12-05Merge branch 'maint-0.4.0' into maint-0.4.1Nick Mathewson
"ours" to avoid version bump.
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-05Merge branch 'maint-0.4.1' into maint-0.4.2teor
2019-12-05Merge branch 'maint-0.4.0' into maint-0.4.1teor
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.1' into maint-0.4.2teor