aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-09-18Merge remote-tracking branch 'onionk/rust-allsupported1' into maint-0.3.3Nick Mathewson
2018-09-14Merge branch 'maint-0.3.2' into maint-0.3.3Nick 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-14rust/protover: delete ProtoSet::retaincypherpunks
As the comment noted, it was horribly inefficient.
2018-09-14rust/protover: use .and_not_in() instead of .retain() in all_supported()cypherpunks
.retain() would allocating a Vec of billions of integers and check them one at a time to separate the supported versions from the unsupported. This leads to a memory DoS. Closes ticket 27206. Bugfix on e6625113c98c281b0a649598d7daa347c28915e9.
2018-09-14rust/protover: add ProtoSet::and_not_in()cypherpunks
This is a way more efficient version of retain().
2018-09-14If options_act() fails, restore the previous value of global_optionsNick Mathewson
Before 0.3.3.1-alpha, we would exit() in this case immediately. But now that we leave tor_main() more conventionally, we need to make sure we restore things so as not to cause a double free. Fixes bug 27708; bugfix on 0.3.3.1-alpha.
2018-09-13rust/protover: validate unknown protocol names use only allowed characterscypherpunks
2018-09-13Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-09-13Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-13Merge branch 'bug27658_029' into maint-0.2.9Nick Mathewson
2018-09-12fixup! changes filecypherpunks
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-12rust/protover: fix check for overlapping rangescypherpunks
Closes ticket 27649. Bugfix on e6625113c98c281b0a649598d7daa347c28915e9.
2018-09-12rust/protover: remove version zero from testscypherpunks
This isn't legal according to dir-spec.txt. We can write separate tests for it if the spec is changed to make it legal.
2018-09-12test/protover: remove version zero from testscypherpunks
This isn't legal according to dir-spec.txt. We can write separate tests for it if the spec is changed to make it legal.
2018-09-11Bug 25505: Check circuitmux queues before padding.Mike Perry
2018-09-11Merge branch 'maint-0.2.9' into maint-0.3.2Nick Mathewson
2018-09-11Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-11Merge remote-tracking branch 'teor/ticket27252-033' into maint-0.3.3Nick 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 maint-0.3.3Nick 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-10Bump to 0.3.3.10-dev.Nick Mathewson
2018-09-10Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
"ours" to avoid version bump.
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-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.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.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.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.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.