aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-25Merge branch 'maint-0.4.0' into release-0.4.0teor
2019-11-25Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-11-25Merge remote-tracking branch 'tor-github/pr/1441' into maint-0.4.0teor
2019-11-25Merge remote-tracking branch 'tor-github/pr/1396' into maint-0.4.0teor
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.4.0' into release-0.4.0Nick Mathewson
2019-11-11Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-11-11Merge branch 'maint-0.2.9' into maint-0.3.5Nick Mathewson
2019-11-11Merge branch 'maint-0.4.0' into release-0.4.0teor
2019-11-11Merge branch 'maint-0.3.5' into maint-0.4.0teor
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.4.0' into release-0.4.0teor
2019-11-06Merge branch 'maint-0.3.5' into maint-0.4.0teor
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.4.0' into release-0.4.0teor
2019-10-29Merge branch 'maint-0.3.5' into maint-0.4.0teor
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.4.0' into release-0.4.0teor
2019-10-25Merge branch 'maint-0.3.5' into maint-0.4.0teor
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-23Merge branch 'maint-0.4.0' into release-0.4.0teor
2019-10-23Merge branch 'maint-0.3.5' into maint-0.4.0teor
2019-10-23Merge branch 'maint-0.2.9' into maint-0.3.5teor
2019-10-23Merge remote-tracking branch 'tor-github/pr/1361' into maint-0.4.0teor
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
2019-10-23Merge remote-tracking branch 'tor-github/pr/1256' into maint-0.3.5teor
2019-10-23Merge branch 'maint-0.2.9' into maint-0.3.5teor
`git merge --strategy ours` to take the 0.3.5 changes for 31001, and ignore the conflicting 0.2.9 changes.
2019-10-23Merge remote-tracking branch 'tor-github/pr/1178' into maint-0.2.9teor
2019-10-22Merge branch 'maint-0.4.0' into release-0.4.0Nick Mathewson
2019-10-22Merge branch 'maint-0.3.5' into maint-0.4.0Nick Mathewson
2019-10-22Merge remote-tracking branch 'tor-github/pr/1376' into maint-0.3.5Nick Mathewson