summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-12-16Merge remote-tracking branch 'tor-github/pr/1459' into bug32240_32242_035teor
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.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-09bump to 0.3.5.9-devNick 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-05Bump version to 0.3.5.9Nick Mathewson
2019-12-05Merge remote-tracking branch 'tor-github/pr/1277' into maint-0.3.5teor
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.
2019-12-03Travis: use -std=gnu99 in some jobsteor
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-01Travis: Disable the macOS Rust jobteor
This time, we're disabling it because it's the lowest priority job. (And also slow.) Part of 32629.
2019-11-28Merge branch 'ticket32629_029' into ticket32629_035teor
Merge re-enable chutney from ticket32629_029 with stem from maint-0.3.5.
2019-11-28Revert "Travis: Disable the Rust macOS build"teor
This reverts commit 4c4a0d50ff4fd01862b78e8cbfaabfa9e4d4ae12.
2019-11-28Revert "Travis: Disable all but one macOS build"teor
This reverts commit 511aeba8eeb24a953228e00917f64703059a7673.
2019-11-25Merge remote-tracking branch 'tor-github/pr/1464' into maint-0.3.5teor
2019-11-25Merge remote-tracking branch 'tor-github/pr/1422' into maint-0.3.5teor
2019-11-25Merge remote-tracking branch 'tor-github/pr/1405' into maint-0.3.5teor
2019-11-25Merge remote-tracking branch 'tor-github/pr/1395' into maint-0.3.5teor
2019-11-25Merge remote-tracking branch 'tor-github/pr/1394' into maint-0.3.5teor
2019-11-11Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
2019-11-11Appveyor: Install OpenSSL to resolve a header/library mismatchteor
Install the mingw OpenSSL package in Appveyor. This makes sure that the OpenSSL headers and libraries match in Tor's Appveyor builds. (This bug was triggered by an Appveyor image update.) Fixes bug 32449; bugfix on 0.3.5.6-rc.
2019-11-09Update geoip and geoip6 to the November 6 2019 database.Karsten Loesing
2019-11-06Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1354' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1340' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1343' into maint-0.3.5teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1342' into maint-0.2.9teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1330' into maint-0.2.9teor
2019-10-29Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-10-29Merge remote-tracking branch 'tor-github/pr/1460' into maint-0.2.9teor
2019-10-25Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-10-25changes: file for 31919's bionic Travis image changeteor
2019-10-25Merge branch 'ticket31919_bionic_029' into ticket31919_bionic_035teor
2019-10-25Travis: Use Ubuntu Bionic, but keep Trusty for chutneyteor
Bionic has a recent coccinelle version, which passes our CI tests. But Bionic (and Xenial) cause permissions errors for chutney. We'll fix those in 32240. Part of 31919.
2019-10-24hs-v3: Remove a BUG() caused by an acceptable raceDavid Goulet
hs_client_purge_state() and hs_cache_clean_as_client() can remove a descriptor from the client cache with a NEWNYM or simply when the descriptor expires. Which means that for an INTRO circuit being established during that time, once it opens, we lookup the descriptor to get the IP object but hey surprised, no more descriptor. The approach here is minimalist that is accept the race and close the circuit since we can not continue. Before that, the circuit would stay opened and the client wait the SockTimeout. Fixers #28970. Signed-off-by: David Goulet <dgoulet@torproject.org>
2019-10-24Travis: Use macOS 10.14 with Xcode 11.2teor
Closes ticket 32241.
2019-10-24Travis: Use zstd in our Travis Linux buildsteor
Recent Ubuntu versions have zstd >= 1.1, which is an optional tor build dependency. Closes ticket 32242.
2019-10-23Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1360' into maint-0.3.5teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1351' into maint-0.2.9teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1284' into maint-0.3.5teor
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion