summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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.
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-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