torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity
29,202 Commits 53 Branches 631 Tags
17511b0dca8d2ef7e579b529c47f07a00b1b2d74
Commit Graph

29202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Mathewson 17511b0dca Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-07 08:44:40 -04:00
Nick Mathewson a4930de5e9 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-09-07 08:44:40 -04:00
Nick Mathewson df18cf0e8f Merge branch 'maint-0.3.2' into maint-0.3.3 2018-09-07 08:44:40 -04:00
Nick Mathewson a5ed62f96c Merge branch 'maint-0.2.9' into maint-0.3.2 2018-09-07 08:44:39 -04:00
Nick Mathewson 912ae2b8dc Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9 2018-09-07 08:44:36 -04:00
Nick Mathewson 4d0abd1b9b Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-07 08:42:19 -04:00
Nick Mathewson b6de39e5f4 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-09-07 08:42:19 -04:00
Nick Mathewson 08d5fd39d8 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-09-07 08:42:19 -04:00
Nick Mathewson a08e6e711f Merge branch 'maint-0.2.9' into maint-0.3.2 2018-09-07 08:42:19 -04:00
teor 9d5c6317b5 hs: Silence a spurious warning in rend_client_send_introduction() 
gcc 8 warns that extend_info_t.nickname might be truncated by strncpy().

But it doesn't know that nickname can either contain a hex id, or a
nicknames. hex ids are only used for general and HSDir circuits.

Fixes bug 27463; bugfix on 0.1.1.2-alpha.
 2018-09-07 12:40:11 +10:00
teor 1570f17f97 Windows: Silence a spurious warning in the GetAdaptersAddresses cast 
GetProcAddress() returns FARPROC, which is (long long int(*)()) on
64-bit Windows:
https://msdn.microsoft.com/en-us/library/windows/desktop/ms683212(v=vs.85).aspx

But GetAdaptersAddresses() is (long unsigned int(*)()), on both 32-bit
and 64-bit Windows:
https://docs.microsoft.com/en-us/windows/desktop/api/iphlpapi/nf-iphlpapi-getadaptersaddresses

So gcc 8 issues a spurious "incompatible function pointer" warning
about the cast to GetAdaptersAddresses_fn_t.

Silence this warning by casting to a void function pointer, before
the cast to GetAdaptersAddresses_fn_t.

This issue is already fixed by 26481 in 0.3.5 and later, by removing
the lookup and cast.

Fixes bug 27465; bugfix on 0.2.3.11-alpha.
 2018-09-07 11:03:10 +10:00
Nick Mathewson 444fd57044 Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-05 10:16:10 -04:00
Nick Mathewson 2b04163666 Merge branch 'maint-0.3.3' into maint-0.3.4 2018-09-05 10:16:06 -04:00
Nick Mathewson a7e72f0c44 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-09-05 10:15:45 -04:00
Nick Mathewson 57b207efa4 Merge branch 'maint-0.2.9' into maint-0.3.2 2018-09-05 10:15:42 -04:00
Nick Mathewson ff1486385a Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9 2018-09-05 10:14:56 -04:00
Nick Mathewson b1350d2797 Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-05 10:01:31 -04:00
Nick Mathewson b390983b27 Merge remote-tracking branch 'teor/ticket27449-034' into maint-0.3.4 2018-09-05 10:01:27 -04:00
Nick Mathewson 67bdd144bd Merge branch 'maint-0.3.2' into maint-0.3.3 2018-09-05 09:56:19 -04:00
Nick Mathewson 2b1b8bf2ca Merge branch 'maint-0.2.9' into maint-0.3.2 2018-09-05 09:56:19 -04:00
Nick Mathewson c7ca7a9380 Merge branch 'maint-0.3.4' into release-0.3.4 2018-09-05 09:56:19 -04:00
Nick Mathewson 4ab033c3bc Merge branch 'maint-0.3.3' into maint-0.3.4 2018-09-05 09:56:19 -04:00
teor 35b0ac8d84 Travis: don't call echo with a --flag as the first argument 
When we use echo in Travis, don't pass a --flag as the first argument.

Fixes bug 27418; bugfix on 0.3.4.7-rc.
 2018-09-05 14:02:46 +10:00
teor d3a3ac013d Appveyor: tail config.log and cat test-suite.log after failed builds 
Also zip the full logs, and upload them as build artifacts.

Implements ticket 27430.
 2018-09-05 13:51:12 +10:00
teor 4e4b6a2476 Travis: when showing a log fails, keep trying to show other logs 
When a Travis build fails, and showing a log fails, keep trying to
show the other logs.

Fixes bug 27453; bugfix on 0.3.4.7-rc.
 2018-09-05 13:12:54 +10:00
teor 90e038e732 Appveyor: always log the compiler path and version 
Implements 27449.
 2018-09-05 10:50:17 +10:00
Nick Mathewson a28c14aad5 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-08-29 11:17:31 -04:00
Nick Mathewson b40f9967fa Merge branch 'maint-0.2.9' into maint-0.3.2 2018-08-29 11:17:31 -04:00
Nick Mathewson c41944d06a Merge branch 'maint-0.3.4' into release-0.3.4 2018-08-29 11:17:31 -04:00
Nick Mathewson 0ea622aa3a Merge branch 'maint-0.3.3' into maint-0.3.4 2018-08-29 11:17:31 -04:00
teor 541b89b061 Test: avoid spurious failures in make test-network-all 
Before running make test-network-all, delete old logs and test result
files, to avoid spurious failures.

Fixes bug 27295; bugfix on 0.2.7.3-rc.
 2018-08-29 10:47:20 +10:00
teor 3e298633ca Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.am 
Part of 27295.
 2018-08-29 10:47:05 +10:00
Nick Mathewson 64c3c6a790 Merge branch 'maint-0.3.2' into maint-0.3.3 2018-08-27 09:39:08 -04:00
Nick Mathewson a7a900685d Merge branch 'maint-0.3.4' into release-0.3.4 2018-08-27 09:39:08 -04:00
Nick Mathewson 0483f7f64c Merge branch 'maint-0.3.3' into maint-0.3.4 2018-08-27 09:39:08 -04:00
teor 70a07fa90b When running make test-network-all, use the mixed+hs-v2 network 
No behaviour change.

A previous fix to chutney removed v3 onion services from the
mixed+hs-v23 network, so seeing "mixed+hs-v23" in tests is
confusing.

Fixes bug 27345; bugfix on 0.3.2.1-alpha.
 2018-08-27 23:07:20 +10:00
Nick Mathewson f5fea59342 Merge branch 'maint-0.3.4' into release-0.3.4 2018-08-24 16:50:32 -04:00
Nick Mathewson 4c1c818ffa Update to 0.3.4.7-rc-dev 2018-08-24 16:49:56 -04:00
Nick Mathewson 8465a8d846 Fix a version number, set a release date (today) tor-0.3.4.7-rc 2018-08-24 15:52:43 -04:00
Nick Mathewson 6809bbe766 Fold in one more changelog entry 2018-08-24 12:37:21 -04:00
Nick Mathewson 86409ec247 Merge branch 'maint-0.3.4' into release-0.3.4 2018-08-24 12:35:26 -04:00
Nick Mathewson 658171318f Merge branch 'maint-0.3.3' into maint-0.3.4 2018-08-24 12:35:23 -04:00
Nick Mathewson 33e4e30d0a Merge branch 'maint-0.3.2' into maint-0.3.3 2018-08-24 12:32:10 -04:00
Nick Mathewson 98e1a1d106 Merge branch 'ticket27286_032_v2' into maint-0.3.2 2018-08-24 12:32:06 -04:00
Nick Mathewson 14be9cba4e Update the protocol versions recommendations to remove LinkAuth=1 
LinkAuth method 1 is the one where we pull the TLS master secrets
out of the OpenSSL data structures and authenticate them with
RSA. Right now we list method 1 as required for clients and relays.
That's a problem, since we can't reasonably support it with NSS. So
let's remove it as a requirement and a recommendation.

As for method 3: I'd like to recommend it it, but that would make
0.2.9 start warning.  Let's not do that till at least some time
after 0.3.5 (the next LTS) is stable.

Closes ticket 27286
 2018-08-24 12:31:01 -04:00
Nick Mathewson eb75966720 Merge branch 'maint-0.3.4' into release-0.3.4 2018-08-24 12:05:39 -04:00
teor dd27e17ccc Bootstrap: add some extra logging 
Diagnostics for 27236.
 2018-08-24 12:05:36 -04:00
teor 3ebbc1c84d Bootstrap: allow internal-only onion service networks to bootstrap 
This fix requires chutney's 27230 fix to bridge client bootstrap.

Part of 27236.
 2018-08-24 12:05:29 -04:00
Nick Mathewson 8a4b41f241 Start on a changelog for 0.3.4.7-rc 2018-08-24 09:18:32 -04:00
Nick Mathewson d911eb80f6 Merge branch 'maint-0.3.4' into release-0.3.4 2018-08-24 09:13:51 -04:00