summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2019-11-15pick a release date.tor-0.4.2.4-rcNick Mathewson
2019-11-12more blurb for 0.4.2.4-rc changelog.Nick Mathewson
2019-11-12Minor edits and sorting on 0.4.2.4-rc changelogNick Mathewson
2019-11-12start changelog for 0.4.2.4-rc.Nick Mathewson
2019-11-12Merge branch 'maint-0.4.2' into release-0.4.2Nick Mathewson
2019-11-12Bump version to 0.4.2.4-rc.Nick Mathewson
2019-11-12Merge branch 'maint-0.4.2' into release-0.4.2teor
2019-11-12test/parseconf: Add tests for ignored optionsteor
These tests will also pass on 0.4.3, with the original implementation, and with the new implementation in 32404. Part of 32295 and 32404.
2019-11-12config: Log the option name when skipping an obsolete optionteor
This is a basic fix for 0.4.2 only. The fix for 0.4.3 and later is in 32404. Fixes bug 32295; bugfix on 0.4.2.1-alpha.
2019-11-11Merge branch 'maint-0.4.2' into release-0.4.2Nick Mathewson
2019-11-11Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2019-11-11Merge branch 'maint-0.4.0' into maint-0.4.1Nick 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.2' into release-0.4.2teor
2019-11-11Merge branch 'maint-0.4.1' into maint-0.4.2teor
2019-11-11Merge branch 'maint-0.4.0' into maint-0.4.1teor
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-07Merge branch 'maint-0.4.2' into release-0.4.2teor
2019-11-07Merge remote-tracking branch 'tor-github/pr/1513' into maint-0.4.2teor
2019-11-06Do not try to shut down the event loop when it is not initialized.Nick Mathewson
Doing so caused us to crash in some unusual circumstances, such as using --verify-config to verify a configuration that failed during the options_act() stage. Fixes bug 32407; bugfix on 0.3.3.1-alpha.
2019-11-06Merge branch 'maint-0.4.2' into release-0.4.2Nick Mathewson
2019-11-06Merge remote-tracking branch 'tor-github/pr/1495' into maint-0.4.2Nick Mathewson
2019-11-06Merge branch 'maint-0.4.2' into release-0.4.2teor
2019-11-06Merge remote-tracking branch 'tor-github/pr/1509' into maint-0.4.2teor
2019-11-06Merge branch 'maint-0.4.2' into release-0.4.2teor
2019-11-06shellcheck: Fix issues in the git-*.sh scriptsteor
Fixes bug 32402; bugfix on 0.4.2.1-alpha. Obviously correct changes to already reviewed code.
2019-11-06shellcheck: Start checking most scripts for errorsteor
This check was accidentally disabled by a bad find command. Fixes bug 32402; bugfix on 0.4.2.1-alpha. Obviously correct changes to already reviewed code.
2019-11-06Makefile: Fix "make check-includes" for out-of-tree buildsteor
Previously, it would run on the build tree, which did not contain any sources. Fixes bug 31335; bugfix on 0.3.5.1-alpha.
2019-11-06Merge branch 'maint-0.4.2' into release-0.4.2teor
2019-11-06Merge branch 'maint-0.4.1' into maint-0.4.2teor
2019-11-06Merge branch 'maint-0.4.0' into maint-0.4.1teor
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/1374' into maint-0.4.1teor
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-11-05configure: Remove a check that will always failteor
And update the changes file to be more specific. Part of 32191.
2019-11-05force pkg-config to only use --prefix when cross-compilingHans-Christoph Steiner
The current pkg-config setup has no sense of whether it is cross-compiling, so it will detect things on the build system that are not present or are wrong for the host system. This forces the cross-compiling build to only look for pkg-config .pc files in --prefix. A version of this has been the setup for many years with the Android builds. Fixes #32191 Signed-off-by: Hans-Christoph Steiner <hans@eds.org>
2019-10-29Merge branch 'maint-0.4.2' into release-0.4.2teor
2019-10-29Merge branch 'maint-0.4.1' into maint-0.4.2teor
2019-10-29Merge branch 'maint-0.4.0' into maint-0.4.1teor
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