summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-09-08and one duplicate from (somehow) 0.3.3.5-rctor-0.3.4.8Roger Dingledine
2018-09-08whoops, we still had duplicates from 0.3.3.6Roger Dingledine
2018-09-08synchronize 0.3.4.8 changelogRoger Dingledine
2018-09-08remove duplicate changes from 0.3.3.5-rc to 0.3.3.9Roger Dingledine
2018-09-07Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-09-07Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
"ours" to avoid bump.
2018-09-07Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
"ours" to avoid bump
2018-09-07Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
"ours" to avoid bump
2018-09-07Bump to 0.3.3.10Nick Mathewson
2018-09-07Bump to 0.3.2.12Nick Mathewson
2018-09-07Bump to 0.2.9.17Nick Mathewson
2018-09-07Finish (?) 0.3.4.8 changelog blurbNick Mathewson
2018-09-07Draft 0.3.4.8 blurbNick Mathewson
2018-09-07Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-09-07Bump to 0.3.4.8Nick Mathewson
2018-09-07Start on release-notes for 0.3.4.8Nick Mathewson
2018-09-07Start on an 0.3.4.8 changelog.Nick Mathewson
2018-09-07Reincorporate changes files removed in bf33ddd into 0.3.4.6-rc changelogNick Mathewson
These should have been removed in master, not in 0.3.4. Closes ticket 27488.
2018-09-07Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-07Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-07Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-09-07Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-09-07Merge branch 'ticket27344_029' into maint-0.2.9Nick Mathewson
2018-09-07Tell openssl to build its TLS contexts with security level 1Nick Mathewson
Fixes bug 27344, where we'd break compatibility with old tors by rejecting RSA1024 and DH1024.
2018-09-07Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-09-07Merge remote-tracking branch 'teor/bug27460-034' into maint-0.3.4Nick Mathewson
2018-09-07Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-07Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-09-07Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-09-07Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-07Merge remote-tracking branch 'teor/bug27461-032' into maint-0.3.2Nick Mathewson
2018-09-07Merge remote-tracking branch 'teor/bug27461-029' into maint-0.2.9Nick Mathewson
2018-09-07Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-07Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-09-07Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-07Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-09-07Merge remote-tracking branch 'teor/bug27463-029' into maint-0.2.9Nick Mathewson
2018-09-07Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-07Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-09-07Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-07Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-09-07Appveyor: Disable gcc hardening in Windows 64-bit buildsteor
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-07Merge branch 'bug27461-029' into bug27461-032teor
Fix a minor merge conflict due to an #endif comment.
2018-09-07Windows: Stop calling SetProcessDEPPolicy() on 64-bit Windowsteor
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-07hs: Silence a spurious warning in rend_client_send_introduction()teor
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-07Windows: Silence a spurious warning in the GetAdaptersAddresses castteor
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-05Merge branch 'maint-0.3.4' into release-0.3.4Nick Mathewson
2018-09-05Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-05Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-05Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson