7e91eb83d8
Merge branch 'maint-0.3.4'
2018-09-07 08:45:10 -04:00
a4930de5e9
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-07 08:44:40 -04:00
df18cf0e8f
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 08:44:40 -04:00
a5ed62f96c
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-07 08:44:39 -04:00
912ae2b8dc
Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9
2018-09-07 08:44:36 -04:00
b6de39e5f4
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-07 08:42:19 -04:00
08d5fd39d8
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 08:42:19 -04:00
a08e6e711f
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-07 08:42:19 -04:00
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
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
8815960c46
Merge remote-tracking branch 'tor-github/pr/294'
2018-09-06 09:47:32 -04:00
6edee54afa
Changes file for 25132
2018-09-06 09:31:39 -04:00
bcfab63ca5
Merge remote-tracking branch 'teor/ticket27467'
2018-09-06 09:24:47 -04:00
d0965561a5
Remove GetAdaptersAddresses_fn_t
...
The code that used it was removed as part of the 26481 refactor.
Closes ticket 27467.
2018-09-06 12:54:03 +10:00
06c14f9209
Merge branch 'maint-0.3.4'
2018-09-05 10:16:11 -04:00
2b04163666
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-05 10:16:06 -04:00
a7e72f0c44
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-05 10:15:45 -04:00
57b207efa4
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-05 10:15:42 -04:00
ff1486385a
Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9
2018-09-05 10:14:56 -04:00
75da2045c5
Merge branch 'maint-0.3.4'
2018-09-05 10:01:31 -04:00
b390983b27
Merge remote-tracking branch 'teor/ticket27449-034' into maint-0.3.4
2018-09-05 10:01:27 -04:00
67bdd144bd
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-05 09:56:19 -04:00
2b1b8bf2ca
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-05 09:56:19 -04:00
2f618094d2
Merge branch 'maint-0.3.4'
2018-09-05 09:56:19 -04:00
4ab033c3bc
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-05 09:56:19 -04:00
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
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
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
90e038e732
Appveyor: always log the compiler path and version
...
Implements 27449.
2018-09-05 10:50:17 +10:00
0db5c54957
Merge branch 'nss_squashed' into nss_merge
2018-09-04 20:21:07 -04:00
c18967d6c8
changes file for our NSS support
2018-09-04 14:52:35 -04:00
fd994f55c4
Merge remote-tracking branch 'rl1987/doc26908'
2018-09-04 11:08:49 -04:00
3507fead10
Merge branch 'tor_api_owning_control'
2018-09-04 11:04:21 -04:00
94b04d6c64
Merge branch 'bug24104_029_squashed'
2018-09-04 10:44:36 -04:00
19f73f6336
Add changes file
2018-09-02 21:14:03 +03:00
bbb82a5249
Add changes file
2018-09-01 18:47:20 -04:00
94605f08fb
Merge branch 'ticket27246_035_01_squashed'
2018-08-29 15:05:05 -04:00
7f1895c39a
Changes for 27246
2018-08-29 15:02:59 -04:00
a28c14aad5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-08-29 11:17:31 -04:00
b40f9967fa
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-08-29 11:17:31 -04:00
0ea622aa3a
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-08-29 11:17:31 -04:00
810152b20f
Merge branch 'maint-0.3.4'
2018-08-29 11:17:31 -04:00
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
48632455a5
Merge branch 'bug26367_035_01'
2018-08-28 16:02:04 -04:00
4976eca826
hs: Render obsolete Tor2web
...
Remove support for Tor2web in the code and build system. At this commit, tor
doesn't have Tor2web support anymore.
Ref: https://lists.torproject.org/pipermail/tor-dev/2018-July/013295.html
Close #26367
Signed-off-by: David Goulet <dgoulet@torproject.org >
2018-08-28 16:01:57 -04:00
b1d32a9223
Merge remote-tracking branch 'dgoulet/ticket27215_035_01'
2018-08-28 16:00:45 -04:00
4e2dcda092
fixup! hs: Change default version from 2 to 3
2018-08-28 15:58:28 -04:00
2bc4c55d7d
Merge remote-tracking branch 'tor-github/pr/245'
2018-08-28 15:44:06 -04:00
3b960df4f9
Merge branch 'bug26896_034'
2018-08-28 12:35:50 -04:00
3890ad2578
Stricter HiddenServicePort parsing
2018-08-28 18:32:31 +03:00
Nick Mathewson
teor
rl1987
juga0
David Goulet