summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2020-04-09Merge branch 'maint-0.4.2' into maint-0.4.3teor
Remove check-best-practices from check-local in maint-0.4.3. (The check-local jobs are all on separate lines in 0.4.3.)
2020-04-09remove practracker from check-local (0.4.2 and 0.4.3 only)Nick Mathewson
practracker shouldn't be running in release or maint branches.
2020-04-09Merge branch 'pr1854_squashed' into maint-0.4.3teor
Squashed PR 1854, and fixed a minor typo (IPv4 -> IPv6).
2020-04-09client: Revert setting PreferIPv6 on by defaultDavid Goulet
This change broke torsocks that by default is expecting an IPv4 for hostname resolution because it can't ask tor for a specific IP version with the SOCKS5 extension. PreferIPv6 made it that sometimes the IPv6 could be returned to torsocks that was expecting an IPv4. Torsocks is probably a very unique case because the runtime flow is that it hijacks DNS resolution (ex: getaddrinfo()), gets an IP and then sends it back for the connect() to happen. The libc has DNS resolution functions that allows the caller to request a specific INET family but torsocks can't tell tor to resolve the hostname only to an IPv4 or IPv6 and thus by default fallsback to IPv4. Reverting this change into 0.4.3.x series but we'll keep it in the 0.4.4.x series in the hope that we add this SOCKS5 extension to tor for DNS resolution and then change torsocks to use that. Fixes #33804 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-04-09Merge branch 'maint-0.4.2' into maint-0.4.3teor
2020-04-09Merge branch 'maint-0.4.1' into maint-0.4.2teor
2020-04-09Merge branch 'maint-0.3.5' into maint-0.4.1teor
2020-04-09Merge remote-tracking branch 'tor-github/pr/1784' into maint-0.3.5teor
2020-04-08Correct 'was not internal' to 'was internal' in test_external_ip()Mrigyen Sawant
2020-04-05doc: Fix another man page typoteor
The default value of the option is "auto", not "default".
2020-04-05doc: Fix a typo in the man pageteor
"proceeding" means starting an action. "preceding" means the thing before this thing. In this context, it's a bit ambiguous.
2020-04-04changes: file for ticket 33782teor
Avoid conflicts between the fake sockets in tor's unit tests, and real file descriptors. Resolves issues running unit tests with GitHub Actions, where the process that embeds or launches the tests has already opened a large number of file descriptors. Fixes bug 33782; bugfix on 0.2.8.1-alpha. Found and fixed by Putta Khunchalee.
2020-04-03Change starting file descriptor for tests.Putta Khunchalee
2020-04-03doc: Rewrite the approved-routers man page entryteor
Obviously correct documentation changes.
2020-04-01configure: Fix enabled module variable expansionDavid Goulet
Fixes #33646 Signed-off-by: David Goulet <dgoulet@torproject.org>
2020-03-30hs-v3: Relax severity of a log message when decoding descriptors.George Kadianakis
Make it LOG_PROTOCOL_WARN and also add the expiration timestamp in there to ease debugging in the future.
2020-03-26Merge branch 'tor-github/pr/1794' into maint-0.4.3David Goulet
2020-03-25Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2020-03-25Merge branch 'maint-0.4.2' into maint-0.4.3Nick Mathewson
2020-03-23Merge branch 'tor-github/pr/1788' into maint-0.4.3George Kadianakis
2020-03-20Merge remote-tracking branch 'tor-github/pr/1823/head' into maint-0.4.3Nick Mathewson
2020-03-20relay/dirauth: Set some output arguments in stubsteor
And document how some functions set their output arguments. Fixes bug 33674; bugfix on 0.4.3.1-alpha.
2020-03-20Set *have_low_ports_out from stub port_parse_ports_relay().Nick Mathewson
Previously we just ignored this option, which would leave it unset, and cause an assertion failure later on when running with the User option. Fixes bug 33668; bugfix on 0.4.3.1-alpha.
2020-03-20practracker: Disable practracker in git hooksteor
Disable our coding standards best practices tracker in our git hooks. 0.4.3 branches only. Closes ticket 33678.
2020-03-20dirauth: Remove a duplicate macro definitionteor
Obviously correct changes to already-reviewed code.
2020-03-20Merge branch 'bug33673_035' into bug33673_041teor
Merge duplicate DLL copies from maint-0.4.1 with bug33673_035.
2020-03-20Appveyor: Copy required DLLs to test and appteor
Copy required DLLs to test and app, before running tor's tests. This ensures that tor.exe and test*.exe use the correct version of each DLL. This fix is not required, but we hope it will avoid DLL search issues in future. Closes bug 33673; bugfix on 0.3.4.2-alpha.
2020-03-20Merge branch 'maint-0.4.2' into maint-0.4.3teor
2020-03-20Merge branch 'maint-0.4.1' into maint-0.4.2teor
2020-03-19Merge branch 'ticket33643_skip_035' into ticket33643_skip_041Nick Mathewson
2020-03-19Appveyor: disable crypto/openssl_versionNick Mathewson
2020-03-19Add a TOR_SKIP_TESTCASES environment variable for suppressing tests.Nick Mathewson
For example, "TOR_SKIP_TESTCASES=crypto/.. ./src/test/test" will run the tests and suppress all the "crypto/" tests. You could get the same effect by running "./src/test/test :crypto/..", but that can be harder to arrange from CI. Part of a fix/workaround for 33643.
2020-03-19doc: Fix a manual page typoteor
And consistently talk about extra-info document publishing. Obviously correct documentation changes.
2020-03-19Merge remote-tracking branch 'tor-github/pr/1806' into maint-0.4.3teor
2020-03-19doc: Fix a man page typoteor
Obviously correct changes to already-reviewed code.
2020-03-18Merge branch 'maint-0.4.2' into maint-0.4.3Nick Mathewson
"ours" to avoid version bump.
2020-03-18Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
"ours" to avoid version bump.
2020-03-18Merge branch 'maint-0.3.5' into maint-0.4.1Nick Mathewson
"ours" to avoid version bump.
2020-03-18Bump version to 0.4.2.7-devNick Mathewson
2020-03-18Bump version to 0.4.1.9-devNick Mathewson
2020-03-18Bump version to 0.3.5.10-devNick Mathewson
2020-03-18Merge branch 'maint-0.4.2' into maint-0.4.3Nick Mathewson
2020-03-18Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2020-03-18Merge branch 'maint-0.3.5' into maint-0.4.1Nick Mathewson
2020-03-18Port rsa_private_key_too_long() to work on OpenSSL 1.1.0.Nick Mathewson
2020-03-17Merge branch 'maint-0.4.2' into maint-0.4.3Nick Mathewson
2020-03-17Merge branch 'maint-0.4.1' into maint-0.4.2Nick Mathewson
2020-03-17Merge branch 'maint-0.3.5' into maint-0.4.1Nick Mathewson
2020-03-17Merge branch 'trove_2020_002_041' into maint-0.4.1Nick Mathewson
2020-03-17Merge branch 'trove_2020_002_035' into maint-0.3.5Nick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion