summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-10-10Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-10-10Merge branch 'maint-0.2.9' into maint-0.3.3Nick Mathewson
2018-10-10Update geoip and geoip6 to the October 9 2018 database.Karsten Loesing
2018-09-24Fix the 0.3.4 part of bug 27781 (arm compilation)Nick Mathewson
Because with arm on OpenSSL <1.1 we don't define USE_EVP_AES_CTR, we need to include crypto_util.h here.
2018-09-21Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-21Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-21Merge branch 'maint-0.2.9' into maint-0.3.2maint-0.3.2Nick Mathewson
2018-09-20Merge remote-tracking branch 'github/bug27139_034' into maint-0.3.4Nick Mathewson
2018-09-18Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-18Merge remote-tracking branch 'onionk/rust-allsupported1' into maint-0.3.3Nick Mathewson
2018-09-14Merge branch 'maint-0.3.3' into maint-0.3.4Nick 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-14Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
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-14Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-09-14Changes file for the 32-bit msec conversion fixes of #27139Nick Mathewson
2018-09-14Make circuitmux ewma timing test more tolerant on 32bit osxNick Mathewson
Since we use a 32-bit approximation for millisecond conversion here, we can't expect so much precision. Fixes part of bug 27139; bugfix on 0.3.4.1-alpha.
2018-09-14Avoid integer overflow on fast 32-bit millisecond conversion.Nick Mathewson
Multiply-then-divide is more accurate, but it runs into trouble when our input is above INT32_MAX/numerator. So when our value is too large, do divide-then-multiply instead. Fixes part of bug 27139; bugfix on 0.3.4.1-alpha.
2018-09-14Use a slightly more accurate formula for OSX 32-bit msec conversionNick Mathewson
We use an optimized but less accurate formula for converting coarse time differences to milliseconds on 32-bit OSX platforms, so that we can avoid 64-bit division. The old numbers were off by 0.4%. The new numbers are off by .006%. This should make the unit tests a bit cleaner, and our tolerances a bit closer.
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-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.3' into maint-0.3.4Nick 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-12Merge branch 'maint-0.3.3' into maint-0.3.4Nick 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-12Merge remote-tracking branch 'teor/bug27464-034' into maint-0.3.4Nick Mathewson
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-11Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
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.3' into maint-0.3.4Nick Mathewson
2018-09-11Merge branch 'maint-0.3.2' into maint-0.3.3Nick Mathewson
2018-09-11Merge remote-tracking branch 'teor/ticket27252-034' into maint-0.3.4Nick 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.3' into maint-0.3.4Nick 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.4.8-devNick Mathewson
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion