0aec613a78
Add an --enable-pic option for people who hack Tor into libraries
...
Closes ticket 23846
2018-09-12 10:10:29 -04:00
19dbc385d5
Merge remote-tracking branch 'tor-github/pr/298'
2018-09-12 09:38:52 -04:00
62743912bc
Merge branch 'pr278_squashed'
2018-09-12 09:06:35 -04:00
c9c16ee8a4
Add changes file
2018-09-12 09:06:16 -04:00
0dbd4fe309
Merge branch 'maint-0.3.4'
2018-09-12 08:17:45 -04:00
73ba308d3d
Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4
2018-09-12 08:17:42 -04:00
8294c40c96
Merge remote-tracking branch 'tor-github/pr/318'
2018-09-12 08:12:19 -04:00
5a2374b074
Merge remote-tracking branch 'tor-github/pr/315'
2018-09-11 15:55:30 -04:00
affbe376f9
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-11 15:53:06 -04:00
ae1aea4cc4
Bug 25505: Check circuitmux queues before padding.
2018-09-11 15:53:03 -04:00
2d0a6d7691
Merge remote-tracking branch 'mikeperry/bug25505'
2018-09-11 14:32:39 -04:00
7852499812
Merge remote-tracking branch 'tor-github/pr/312'
2018-09-11 14:05:16 -04:00
042a9fd8b0
Merge branch 'maint-0.3.4'
2018-09-11 13:09:21 -04:00
46bccc50e5
Merge remote-tracking branch 'teor/ticket27252-034' into maint-0.3.4
2018-09-11 13:09:18 -04:00
8e714d2a02
Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3
2018-09-11 13:09:09 -04:00
8a873a5695
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-11 12:04:56 -04:00
8afc100cb5
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-11 12:04:56 -04:00
f741505642
Merge branch 'maint-0.3.4'
2018-09-11 12:04:56 -04:00
3119cb5062
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-11 12:04:55 -04:00
19429fac23
Update geoip and geoip6 to the September 6 2018 database.
2018-09-11 09:26:59 +02:00
617160895c
Defer reporting directory bootstrap progress
...
Existing cached directory information can cause misleadingly high
bootstrap percentages. To improve user experience, defer reporting of
directory information progress until at least one connection has
succeeded to a relay or bridge.
Closes ticket 27169.
2018-09-10 15:20:50 -05:00
1e296bc6de
Call event_set_mem_functions during initialization
2018-09-09 18:58:03 +03:00
859d744eb8
in master, remove changes files for already-merged changes
2018-09-07 09:39:54 -04:00
732ea9120c
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 09:15:56 -04:00
8849b2ca3c
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-07 09:15:56 -04:00
ee6d8bcf71
Merge branch 'maint-0.3.4'
2018-09-07 09:15:56 -04:00
0366ae224c
Merge branch 'maint-0.2.9' into maint-0.3.2
2018-09-07 09:15:52 -04:00
2ec88a2a6d
Tell openssl to build its TLS contexts with security level 1
...
Fixes bug 27344, where we'd break compatibility with old tors by
rejecting RSA1024 and DH1024.
2018-09-07 09:15:06 -04:00
291876be36
Merge branch 'maint-0.3.4'
2018-09-07 08:48:23 -04:00
967cef2f8f
Merge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4
2018-09-07 08:48:19 -04:00
579770b706
Merge branch 'maint-0.3.4'
2018-09-07 08:46:46 -04:00
056003d602
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 08:46:45 -04:00
a78504dbe6
Merge branch 'maint-0.3.3' into maint-0.3.4
2018-09-07 08:46:45 -04:00
eacaff6ccc
Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2
2018-09-07 08:46:41 -04:00
9fcb3ef787
Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9
2018-09-07 08:46:35 -04:00
7e91eb83d8
Merge branch 'maint-0.3.4'
2018-09-07 08:45:10 -04:00
df18cf0e8f
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 08:44:40 -04:00
a4930de5e9
Merge branch 'maint-0.3.3' into maint-0.3.4
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
08d5fd39d8
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-09-07 08:42:19 -04:00
b6de39e5f4
Merge branch 'maint-0.3.3' into maint-0.3.4
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
e70cf82625
Appveyor: Disable gcc hardening in Windows 64-bit builds
...
As of August 29, 2018, Appveyor images come with gcc 8.2.0 by
default. 64-bit Windows executables compiled with gcc 8.2.0 and
tor's --enable-gcc-hardening crash.
Fixes bug 27460; bugfix on 0.3.4.1-alpha.
2018-09-07 13:52:20 +10:00
d2105ff5d5
Merge branch 'bug27461-029' into bug27461-032
...
Fix a minor merge conflict due to an #endif comment.
2018-09-07 13:00:34 +10:00
8ef4bb7f3e
Windows: Stop calling SetProcessDEPPolicy() on 64-bit Windows
...
It is not supported, and always fails. Some compilers warn about the
function pointer cast on 64-bit Windows.
Fixes bug 27461; bugfix on 0.2.2.23-alpha.
2018-09-07 12:58:11 +10: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
Nick Mathewson
rl1987
Mike Perry
Karsten Loesing
Taylor Yu
teor