summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-09-10Copy 0.3.3.10 changelog to releasenotestor-0.3.3.10Nick Mathewson
2018-09-07find and neutralize nickm's easter eggRoger Dingledine
also fix a typo while i'm here
2018-09-07Remove folded-in changes file (0.3.3.10)Nick Mathewson
2018-09-07Construct changelog for 0.3.3.10Nick Mathewson
2018-09-07Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
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-07Merge branch 'maint-0.3.3' into release-0.3.3Nick 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 '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.3' into release-0.3.3Nick 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 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.3' into release-0.3.3Nick 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 remote-tracking branch 'teor/bug27463-029' into maint-0.2.9Nick Mathewson
2018-09-07Merge branch 'maint-0.3.3' into release-0.3.3Nick 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 '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.3' into release-0.3.3Nick 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
2018-09-05Merge remote-tracking branch 'teor/bug27418-029' into maint-0.2.9Nick Mathewson
2018-09-05Merge branch 'maint-0.3.3' into release-0.3.3Nick 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
2018-09-05Travis: don't call echo with a --flag as the first argumentteor
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-05Travis: when showing a log fails, keep trying to show other logsteor
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-08-29Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2018-08-29Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-08-29Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-08-29Test: avoid spurious failures in make test-network-allteor
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-29Test: consistently use $(TEST_NETWORK_ALL_LOG_DIR) in Makefile.amteor
Part of 27295.
2018-08-27Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2018-08-27Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-08-27When running make test-network-all, use the mixed+hs-v2 networkteor
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-24Merge branch 'maint-0.3.3' into release-0.3.3Nick Mathewson
2018-08-24Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson