aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-09-21Merge branch 'maint-0.3.2' into release-0.3.2release-0.3.2Nick Mathewson
2018-09-21Merge branch 'maint-0.2.9' into maint-0.3.2maint-0.3.2Nick Mathewson
2018-09-14Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2018-09-14hs-v3: Don't BUG() on directory permission check failureDavid Goulet
In hs_config.c, we do validate the permission of the hidden service directory but we do not try to create it. So, in the event that the directory doesn't exists, we end up in the loading key code path which checks for the permission and possibly creates the directory. On failure, don't BUG() since there is a perfectly valid use case for that function to fail. Fixes #27335 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-09-14protover: reject invalid protocol namescypherpunks
The spec only allows the characters [A-Za-z0-9-]. Fix on b2b2e1c7f24d9b65059e3d089768d6c49ba4f58f. Fixes #27316; bugfix on 0.2.9.4-alpha.
2018-09-13Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2018-09-13Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-09-13Merge branch 'bug27658_029' into maint-0.2.9Nick Mathewson
2018-09-12Check waitpid return value and exit status in tinytest.cNick Mathewson
It's possible for a unit test to report success via its pipe, but to fail as it tries to clean up and exit. Notably, this happens on a leak sanitizer failure. Fixes bug 27658; bugfix on 0.2.2.4-alpha when tinytest was introduced.
2018-09-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2018-09-11Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-09-11Merge remote-tracking branch 'teor/ticket27252-032' into maint-0.3.2Nick Mathewson
2018-09-11Merge remote-tracking branch 'teor/ticket27252-029' into maint-0.2.9Nick Mathewson
2018-09-11Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2018-09-11Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-09-11Update geoip and geoip6 to the September 6 2018 database.Karsten Loesing
2018-09-10Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2018-09-10Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
"ours" to avoid version bump.
2018-09-10Bump to 0.3.2.12-devNick Mathewson
2018-09-10Bump to 0.2.9.17-devNick Mathewson
2018-09-10Copy 0.3.2.12 changelog to releasenotestor-0.3.2.12Nick Mathewson
2018-09-07Remove folded-in changes file (0.3.2.12)Nick Mathewson
2018-09-07Create a changelog for 0.3.2.12Nick Mathewson
2018-09-07Merge branch 'maint-0.3.2' into release-0.3.2Nick Mathewson
2018-09-07Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
"ours" to avoid bump
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.2' into release-0.3.2Nick 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.2' into release-0.3.2Nick 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.2' into release-0.3.2Nick 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 release-0.3.2Nick 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.2' into release-0.3.2Nick 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.2' into release-0.3.2Nick 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.