aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2018-10-24Merge remote-tracking branch 'tor-github/pr/409'Nick Mathewson
2018-10-24Merge branch 'maint-0.3.5'Nick Mathewson
2018-10-24rust/tor_log: fix C_RUST_COUPLED documentationcypherpunks
This file was moved in 97b15a1d7c51764888d2172711e3f3a71fb01916 and moved again in e7f5f48d68553206b95cbb4f610702c887500124.
2018-10-23Merge branch 'maint-0.3.5'Nick Mathewson
2018-10-23Merge branch 'maint-0.3.4' into maint-0.3.5Nick Mathewson
2018-10-23Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-10-23Merge remote-tracking branch 'onionk/rust-allsupportednull1' into maint-0.3.3Nick Mathewson
2018-10-22Merge remote-tracking branch 'tor-github/pr/421'Nick Mathewson
2018-10-21clean up a tor2web commentRoger Dingledine
2018-10-19Merge remote-tracking branch 'tor-github/pr/396'Nick Mathewson
2018-10-19Merge remote-tracking branch 'onionk/rust-protocommas1' into maint-0.3.5Nick Mathewson
2018-10-19Merge remote-tracking branch 'onionk/rust-protocommas1'Nick Mathewson
2018-10-18Merge remote-tracking branch 'dgoulet/ticket27471_035_02'Nick Mathewson
2018-10-18test: Add test for closing intro circuits when storing a new descriptorDavid Goulet
This is client side and related to 27471 for previous commit that fixes this issue. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-10-18hs-v3: Close client intro circuits if the descriptor is replacedDavid Goulet
When storing a descriptor in the client cache, if we are about to replace an existing descriptor, make sure to close every introduction circuits of the old descriptor so we don't have leftovers lying around. Ticket 27471 describes a situation where tor is sending an INTRODUCE1 cell on an introduction circuit for which it doesn't have a matching intro point object (taken from the descriptor). The main theory is that, after a new descriptor showed up, the introduction points changed which led to selecting an introduction circuit not used by the service anymore thus for which we are unable to find the corresponding introduction point within the descriptor we just fetched. Closes #27471. Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-10-18Merge branch 'ticket27549_035_01_squashed'Nick Mathewson
2018-10-18hs-v3: Consolidate descriptor cookie computation codeDavid Goulet
Both client and service had their own code for this. Consolidate into one place so we avoid duplication. Closes #27549 Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-10-18Merge branch 'maint-0.3.3' into maint-0.3.4Nick Mathewson
2018-10-18Merge branch 'maint-0.3.5'Nick Mathewson
2018-10-17Merge branch 'bug27800-034' into bug27800-035Taylor Yu
2018-10-17Merge branch 'bug27800-033' into tor-034Taylor Yu
2018-10-17Log more info for duplicate ed25519 IDsTaylor Yu
Occasionally, key pinning doesn't catch a relay that shares an ed25519 ID with another relay. Log the identity fingerprints and the shared ed25519 ID when this happens, instead of making a BUG() warning. Fixes bug 27800; bugfix on 0.3.2.1-alpha.
2018-10-17evloop: fix docs for threadpool_register_reply_eventcypherpunks
Commit 6a5f62f68f2c73dbbbbddb4fa3759586f4c2b0dc ultimately didn't include the base argument, and the callback is named cb.
2018-10-17evloop: fix docscypherpunks
alert_sockets_t was moved in 544ab27a949406628809869111b7288017a5bcb1.
2018-10-17Bump to 0.3.6.0-alpha-dev.Nick Mathewson
2018-10-17Bump to 0.3.5.3-alpha-devNick Mathewson
2018-10-17merge in some fixes i found in a sandboxRoger Dingledine
2018-10-17Merge branch 'maint-0.3.4'Nick Mathewson
2018-10-17conn: Stop writing when our write bandwidth limist is exhaustedDavid Goulet
Commit 488e2b00bf881b97bcc8e4bbe304845ff1d79a03 introduced an issue, most likely introduced by a bad copy paste, that made us stop reading on the connection if our write bandwidth limit was reached. The problem is that because "read_blocked_on_bw" was never set, the connection was never reenabled for reading. This is most likely the cause of #27813 where bytes were accumulating in the kernel TCP bufers because tor was not doing reads. Only relays with RelayBandwidthRate would suffer from this but affecting all relays connecting to them. And using that tor option is recommended and best practice so many many relays have it enabled. Fixes #28089.
2018-10-17Bump to 0.3.5.3-alphaNick Mathewson
2018-10-16Merge remote-tracking branch 'tor-github/pr/406'Nick Mathewson
2018-10-16Merge remote-tracking branch 'tor-github/pr/408'Nick Mathewson
2018-10-16Argh. The unset value for OwningControllerFD is NOT -1.Nick Mathewson
2018-10-16Merge branch 'bug27849_redux'Nick Mathewson
2018-10-16Merge remote-tracking branch 'tor-github/pr/404'Nick Mathewson
2018-10-16Add a tor_free() in tor_gencert to fix a coverity warningNick Mathewson
2018-10-16One testcase for annotation handling in tokenize_string()rl1987
2018-10-16Test AT_END checking in tokenize_string()rl1987
2018-10-16Add testcase for too many elements in tokenize_string() inputrl1987
2018-10-16Add testcase for too few elements in tokenize_string() inputrl1987
2018-10-16Unit-test multiple line parsing with tokenize_string()rl1987
2018-10-16Unit-test some error conditions in get_next_token()rl1987
2018-10-16Test object parsing in get_next_token()rl1987
2018-10-16Fix memory management in test_parsecommon_get_next_token_parse_keysrl1987
2018-10-16Test RSA private key parsing with get_next_token()rl1987
2018-10-16Test-case for public key parsing using get_next_token()rl1987
2018-10-16Test argument concatenation in get_next_token()rl1987
2018-10-16First testcase for get_next_token()rl1987
2018-10-16Add new source file to test targetrl1987
2018-10-16Fix typo in comment for hs_cell_parse_introduce2()Neel Chauhan
7apu2bq3rhoylwmucxizk54afw5jyda7pho4j5zdcqpwkufke7zdzwad.onion