aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* 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
| |\ \ \ \ \
| | * | | | | Make all consumers of microdesc_t.body tolerate NULLNick Mathewson2013-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is another fix to try to mitigate recurrences of 8031/8822.
| | * | | | | Unmap the microdescriptor cache before replacing it.Nick Mathewson2013-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a reprise of the fix in bdff7e3299d78; 6905c1f6 reintroduced that bug. Briefly: windows doesn't seem to like deleting a mapped file. I tried adding the PROT_SHARED_DELETE flag to the createfile all, but that didn't actually fix this issue. Fortunately, the unit test I added in 4f4fc63fea0589a4fa03f3859dc27860cdde75af should prevent us from making this particular screw-up again. This patch also tries to limit the crash potential of a failure to write by a little bit, although it could do a better job of retaining microdescriptor bodies. Fix for bug 8822, bugfix on 0.2.4.12-alpha.
* | | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-12
|\| | | | | |
| * | | | | | Fix the biggest errors in doc/HACKINGNick Mathewson2013-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We can wait for 0.2.5 for a full rewrite. #8964
* | | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-12
|\| | | | | |
| * | | | | | Remove various outdated documents.Nick Mathewson2013-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | doc/TODO and doc/spec/README were placeholders to tell people where to look for the real TODO and README stuff -- we replaced them years ago, though. authority-policy, v3-authority-howto, and torel-design.txt belong in torspec. I'm putting them in attic there since I think they may be in large part obsolete, but someone can rescue them if they're not. translations.txt is outdated, and refers to lots of programs other than Tor. We have much better translation resources on the website now. tor-win32-mingw-creation.txt is pending review of a revised version for 0.2.5 (see ticket #4520), but there's no reason to ship this one while we're waiting for an accurate version. the tor-rpm-creation.txt isn't obsolete AFAIK, but it belongs in doc/contrib if anywhere. Resolves bug #8965.
* | | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-12
|\| | | | | |
| * | | | | | Merge remote-tracking branch 'andrea/bug8639_v3' into maint-0.2.4Nick Mathewson2013-06-12
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | When launching a resolve request on behalf of an AF_UNIX control, omit the ↵Andrea Shepard2013-05-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | address field of the new entry connection. Fixes bug 8639.
* | | | | | | Issue #9043 - changelog entryMarek Majkowski2013-06-12
| | | | | | |
* | | | | | | Fix #9043 - simplyfy the code and use EVP_PKEY_cmp instead of pkey_eq / ↵Marek Majkowski2013-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | tor_tls_evp_pkey_eq
* | | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-12
|\| | | | | |
| * | | | | | Revert "Use the FILE_SHARE_DELETE flag for CreateFile on a mapping"Nick Mathewson2013-06-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 884a0e269c382f9e927d8c8b1ef4ef9d2d48379d. I'm reverting this because it doesn't actually make the problem go away. It appears that instead we need to do unmap-then-replace.
* | | | | | | Merge remote-tracking branch 'origin/maint-0.2.4'Nick Mathewson2013-06-12
|\| | | | | |
| * | | | | | Merge remote-tracking branch 'public/bug2077_share_delete' into maint-0.2.4Nick Mathewson2013-06-12
| |\ \ \ \ \ \
| | * | | | | | Use the FILE_SHARE_DELETE flag for CreateFile on a mappingNick Mathewson2013-06-12
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A comment by rransom on #8795 taken together with a comment by doorss recorded on #2077 suggest that *every* attempt to replace the md cache will fail on Vista/Win7 if we don't have the FILE_SHARE_DELETE flag passed to CreateFile, and if we try to replace the file ourselves before unmapping it. I'm adding the FILE_SHARE_DELETE, since that's this simplest fix. Broken indexers (the favored #2077 hypothesis) could still cause trouble here, but at least this patch should make us stop stepping on our own feet. Likely fix for #2077 and its numerous duplicates. Bugfix on 0.2.2.6-alpha, which first had a microdescriptor cache that would get replaced before remapping it.
generated by cgit v1.2.3 (git 2.45.0) at 2024-11-26 20:58:05 +0000