aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Fix #5584 - raise awareness of safer logging - warn about potentially unsafe ↵Marek Majkowski2013-06-24
| | | | config options
* Forward-port the 0.2.4.14-alpha changelogNick Mathewson2013-06-18
|
* Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-18
|\
| * Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-06-18
| |\
| | * Fix some problems with the bug9002 fix.Nick Mathewson2013-06-18
| | | | | | | | | | | | Fixes bug 9090; bug not in any released Tor.
* | | Check more return values in the unit testsNick Mathewson2013-06-18
| | |
* | | Attempt to un-confuse coverity about (false) double-free in bench_onion_ntor.Nick Mathewson2013-06-18
| | |
* | | Fix a couple of resource leaks in test_config.cNick Mathewson2013-06-18
| | | | | | | | | | | | Spotted by Coverity Scan. Not in any released Tor.
* | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-18
|\| |
| * | Tweak bug9063_redux patch: {n_p}_chan_cells, not {n,p}_conn_cellsNick Mathewson2013-06-18
| | |
| * | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-06-18
| |\| | | | | | | | | | | | | | | | Conflicts: src/or/config.c src/or/relay.c
| | * Merge branch 'bug9063_redux_023_squashed' into maint-0.2.3Nick Mathewson2013-06-18
| | |\
| | | * Implement a real OOM-killer for too-long circuit queues.Nick Mathewson2013-06-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This implements "algorithm 1" from my discussion of bug #9072: on OOM, find the circuits with the longest queues, and kill them. It's also a fix for #9063 -- without the side-effects of bug #9072. The memory bounds aren't perfect here, and you need to be sure to allow some slack for the rest of Tor's usage. This isn't a perfect fix; the rest of the solutions I describe on codeable.
| | * | Limit hidden service descriptors to at most 10 guard nodes.Nick Mathewson2013-06-16
| | |/ | | | | | | | | | | | | Fixes bug 9002; bugfix on 0.1.1.11-alpha (which introduced guard nodes), or on 0.0.6pre1 (which introduced hidden services).
* | | Merge remote-tracking branch 'public/bug9082'Nick Mathewson2013-06-17
|\ \ \
| * | | Fix bug 9082: avoid leak when freeing destroy cell queuesNick Mathewson2013-06-17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In my #7912 fix, there wasn't any code to remove entries from the (channel, circuit ID)->circuit map corresponding to queued but un-sent DESTROYs. Spotted by skruffy. Fixes bug 9082; bug not in any released Tor.
* | | | forward-port 0.2.4.13-alpha changelogRoger Dingledine2013-06-16
| | | |
* | | | Merge branch 'bug9072-024' into bug9072-025Andrea Shepard2013-06-15
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'bug9072-023' into bug9072-024Andrea Shepard2013-06-15
| |\ \ \ | | | |/ | | |/|
| | * | Disable middle relay queue overfill detection code due to possible guard ↵Andrea Shepard2013-06-15
| | | | | | | | | | | | | | | | discovery attack
* | | | Instead of testing for __GNUC__, use CHECK_SCANF, like CHECK_PRINTF.dana koch2013-06-14
| | | | | | | | | | | | | | | | This lets us have the possibility of fine-tuning the check in the tor_sscanf test cases at a later date.
* | | | Merge branch 'circuit_queue_cap-0.2.5-squashed'Nick Mathewson2013-06-14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/relay.c
| * | | | Fix signed/unsigned comparison warningNick Mathewson2013-06-14
| | | | |
| * | | | Increase the limit so leaky pipe might workNick Mathewson2013-06-14
| | | | |
| * | | | Don't queue more cells as a middle relay than the spec allows to be in flightAndrea Shepard2013-06-13
| | | | |
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-14
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | Using "ours" strategy to avoid taking commits
| * | | | Merge branch 'circuit_queue_cap-0.2.4-squashed' into maint-0.2.4Nick Mathewson2013-06-14
| |\ \ \ \
| | * | | | Increase the limit so leaky pipe might workNick Mathewson2013-06-14
| | | | | |
| | * | | | Don't queue more cells as a middle relay than the spec allows to be in flightAndrea Shepard2013-06-13
| | | | | |
| * | | | | Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4Nick Mathewson2013-06-14
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| | Using "ours" strategy to avoid taking changes.
| | * | | Merge branch 'circuit_queue_cap-0.2.3-squashed' into maint-0.2.3Nick Mathewson2013-06-14
| | |\ \ \
| | | * | | Increase the limit so leaky pipe might workNick Mathewson2013-06-14
| | | | | |
| | | * | | Don't queue more cells as a middle relay than the spec allows to be in flightAndrea Shepard2013-06-13
| | |/ / /
* | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-13
|\| | | |
| * | | | Merge branch 'bug9047' into maint-0.2.4Nick Mathewson2013-06-13
| |\ \ \ \
| | * | | | Define SEEK_SET for platforms that lack it.Nick Mathewson2013-06-13
| | | | | |
| | * | | | If we write the annotation but not the microdescriptor, rewind.Nick Mathewson2013-06-13
| |/ / / / | | | | | | | | | | | | | | | | | | | | This fixes bug 9047 (and some parts of 9031, 8922, 8883 that weren't fixed in 8822). Bugfix on 0.2.2.6-alpha.
* | | | | Rename networkstatus_dl_interval() -> networkstatus_dl_check_interval()Nick Mathewson2013-06-13
| | | | |
* | | | | Merge remote-tracking branch 'linus/bug8532'Nick Mathewson2013-06-13
|\ \ \ \ \
| * | | | | Hide consensus download interval, depending on TestingTorNetwork, in a macro.Linus Nordberg2013-06-10
| | | | | |
| * | | | | Add support for offsetting the voting interval in order to bootstrap faster.Linus Nordberg2013-06-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new option TestingV3AuthVotingStartOffset is added which offsets the starting time of the voting interval. This is possible only when TestingTorNetwork is set. This patch makes run_scheduled_events() check for new consensus downloads every second when TestingTorNetwork, instead of every minute. This should be fine, see #8532 for reasoning. This patch also brings MIN_VOTE_SECONDS and MIN_DIST_SECONDS down from 20 to 2 seconds, unconditionally. This makes sanity checking of misconfiguration slightly less sane. Addresses #8532.
* | | | | | Merge remote-tracking branch 'public/bug7912_squashed'Nick Mathewson2013-06-13
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Fix compile warnings wrt printf formating of int64_tNick Mathewson2013-06-13
| | | | | |
| * | | | | Add a changes file for bug 7912Nick Mathewson2013-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm calling it a bugfix on 0.2.0.1-alpha, since that's where cell queues were first introduced.
| * | | | | Add destroy balance tracking and logging to circuitmuxAndrea Shepard2013-06-13
| | | | | |
| * | | | | Implementation of a fix for bug 7912Nick Mathewson2013-06-13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I added the code to pass a destroy cell to a queueing function rather than writing it immediately, and the code to remember that we shouldn't reuse the circuit id until the destroy is actually sent, and the code to release the circuit id once the destroy has been sent... and then I finished by hooking destroy_cell_queue into the rest of Tor.
| * | | | | Code to track on a circuit whether it has a "pending" delete cellNick Mathewson2013-06-13
| | | | | | | | | | | | | | | | | | | | | | | | This will be used in a fix for bug7912.
| * | | | | Implement a placeholder mechanism in the channel,id->circ mapNick Mathewson2013-03-21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We'll use this to help fix bug 7912, by providing a way to mark that a circuit ID can't get reused while a DESTROY is queued but not sent.
* | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-13
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge remote-tracking branch 'public/bug8822' into maint-0.2.4Nick Mathewson2013-06-13
| |\ \ \ \ \