aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* Split the generic config_fmt_t code into a new confparse.c fileNick Mathewson2012-09-13
| | | | | This helps us split up one of our larger files, and sets the stage for refactoring the configuration backend a little
* Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-09-13
|\
| * mention the bug number in the 6827 changes fileNick Mathewson2012-09-13
| |
| * Avoid undefined behaviour when parsing HS protocol versionsRobert Ransom2012-09-13
| | | | | | | | | | | | | | Fixes bug 6827; bugfix on c58675ca728f12b42f65e5b8964ae695c2e0ec2d (when the v2 HS desc parser was implemented). Found by asn.
* | Merge branch 'bug6815'Nick Mathewson2012-09-12
|\ \
| * | Fix a wide lineNick Mathewson2012-09-12
| | |
| * | Fix directory self-testing logicNick Mathewson2012-09-12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When I removed version_supports_begindir, I accidentally removed the mechanism we had been using to make a directory cache self-test its directory port. This caused bug 6815, which caused 6814 (both in 0.2.4.2-alpha). To fix this bug, I'm replacing the "anonymized_connection" argument to directory_initiate_command_* with an enumeration to say how indirectly to connect to a directory server. (I don't want to reinstate the "version_supports_begindir" argument as "begindir_ok" or anything -- these functions already take too many arguments.) For safety, I made sure that passing 0 and 1 for 'indirection' gives the same result as you would have gotten before -- just in case I missed any 0s or 1s.
* | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-09-12
|\ \ \ | | |/ | |/| | | | | | | Use the "ours" strategy so that we retain 4aff97cfc796, which maint-0.2.3 just reverted.
| * | Revert "6819: typo in torrc.sample.in"Nick Mathewson2012-09-12
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4aff97cfc7965414ad8506ce28a296da1bc4a161. We don't actually want to be changing the torrc.sample on stable or near-stable stuff, since doing so makes pointless busywork for debian users.
* | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-09-12
|\| |
| * | Merge remote-tracking branch 'public/bug6341_a_v2' into maint-0.2.3Nick Mathewson2012-09-12
| |\ \
| | * | Check ewma_enabled before doing circ-has-become-inactive checkNick Mathewson2012-07-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids a possible crash bug in flush_from_first_active_circuit. Fixes bug 6341; bugfix on 0.2.2.7-alpha. Bug reported and fixed by a pseudonymous user on IRC.
* | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-09-12
|\| | |
| * | | 6819: typo in torrc.sample.inNick Mathewson2012-09-12
| | | |
* | | | hot: we fixed incancations to be intancations.Roger Dingledine2012-09-12
| |_|/ |/| |
* | | Merge remote-tracking branch 'public/bug6538'Nick Mathewson2012-09-11
|\ \ \ | | | | | | | | | | | | | | | | Conflicts: configure.ac
| * | | Use a time-invariant comparison in choose_array_element_by_weightNick Mathewson2012-08-28
| | | |
| * | | In choose-by-bw, scale to better use the range of uint64Nick Mathewson2012-08-27
| | | | | | | | | | | | | | | | | | | | The smart part of this is based on an approach and a suggestion by rransom. The unsmart part is my own fault.
| * | | Spelling fix in util.c commentsNick Mathewson2012-08-27
| | | |
| * | | Refactor the core of choosing by weights into a functionNick Mathewson2012-08-09
| | | | | | | | | | | | | | | | | | | | This eliminates duplicated code, and lets us test a hairy piece of functionality.
| * | | Refactor smartlist_choose_node_by_bandwidth to be less horrible.Nick Mathewson2012-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With this patch, I dump the old kludge of using magic negative numbers to indicate unknown bandwidths. I also compute each node's weighted bandwidth exactly once, rather than computing it once in a loop to compute the total weighted bandwidth and a second time in a loop to find which one we picked.
| * | | Use a smarter fix for bug 1203.Nick Mathewson2012-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we had incremented rand_bw so that when we later tested "tmp >= rand_bw", we wouldn't have an off-by-one error. But instead, it makes more sense to leave rand_bw alone and test "tmp > rand_bw". Note that this is still safe. To take the example from the bug1203 writeup: Suppose that we have 3 nodes with bandwidth 1. So the bandwidth array is { 1, 1, 1 }, and the total bandwidth is 3. We choose rand_bw == 0, 1, or 2. With the first iteration of the loop, tmp is now 1; with the second, tmp is 2; with the third, tmp is 3. Now that our check is tmp > rand_bw, we will set i in the first iteration of the loop iff rand_bw == 0; in the second iteration of the loop iff rand_bw == 1, and in the third iff rand_bw == 2. That's what we want. Incidentally, this change makes the bug 6538 fix more ironclad: once rand_bw is set to UINT64_MAX, tmp > rand_bw is obviously false regardless of the value of tmp.
| * | | Remove remaining timing-dependency in choosing nodes by bandwidthNick Mathewson2012-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old approach, because of its "tmp >= rand_bw && !i_has_been_chosen" check, would run through the second part of the loop slightly slower than the first part. Now, we remove i_has_been_chosen, and instead set rand_bw = UINT64_MAX, so that every instance of the loop will do exactly the same amount of work regardless of the initial value of rand_bw. Fix for bug 6538.
| * | | Change smartlist_choose_node_by_bandwidth to avoid doubleNick Mathewson2012-08-09
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make our preferred solution to #6538 easier to implement, avoid a bunch of potential nastiness with excessive int-vs-double math, and generally make the code there a little less scary. "But wait!" you say. "Is it really safe to do this? Won't the results come out differently?" Yes, but not much. We now round every weighted bandwidth to the nearest byte before computing on it. This will make every node that had a fractional part of its weighted bandwidth before either slighty more likely or slightly less likely. Further, the rand_bw value was only ever set with integer precision, so it can't accurately sample routers with tiny fractional bandwidth values anyway. Finally, doing repeated double-vs-uint64 comparisons is just plain sad; it will involve an implicit cast to double, which is never a fun thing.
* | | | put all the changelogs into masterRoger Dingledine2012-09-11
| | | |
* | | | Merge remote-tracking branch 'origin/maint-0.2.3'Nick Mathewson2012-09-11
|\ \ \ \ | | |/ / | |/| |
| * | | Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3Nick Mathewson2012-09-11
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: src/test/test_util.c
| | * \ \ Merge branch 'timegm_assert_v3_squashed' into maint-0.2.2Nick Mathewson2012-09-11
| | |\ \ \
| | | * | | Fix assertion failure in tor_timegm.Nick Mathewson2012-09-11
| | |/ / / | | | | | | | | | | | | | | | Fixes bug 6811.
* | | | | Bump version to 0.2.4.2-alpha-devNick Mathewson2012-09-10
| | | | |
* | | | | fold in anotherRoger Dingledine2012-09-10
| | | | |
* | | | | Merge branch 'maint-0.2.3'Roger Dingledine2012-09-10
|\| | | |
| * | | | Avoid segfault when reading state file from ancient torNick Mathewson2012-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If s_values is null in rep_hist_load_bwhist_state_section, we would call smartlist_len() on it, and die. Fixes bug 6801.
* | | | | give 0.2.4.2-alpha a blurbRoger Dingledine2012-09-10
| | | | |
* | | | | bump to 0.2.4.2-alphaRoger Dingledine2012-09-10
| | | | |
* | | | | fold in recent changes filesRoger Dingledine2012-09-10
| | | | |
* | | | | Merge branch 'remove_old_ver_checks'Nick Mathewson2012-09-10
|\ \ \ \ \
| * | | | | Remove one more check for an insanely old versionNick Mathewson2012-09-07
| | | | | |
| * | | | | Remove version_supports checks for versions before 0.2.2.Nick Mathewson2012-09-07
| | | | | |
* | | | | | Merge remote-tracking branch 'public/ticket6789'Nick Mathewson2012-09-10
|\ \ \ \ \ \
| * | | | | | Dirservers no longer accept tors released before December 2011.Nick Mathewson2012-09-07
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements ticket 6789.
* | | | | | | Downgrade "EVP ctr128 is ok" message to infoNick Mathewson2012-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Part of 6736 effort to try to make startup quieter.
* | | | | | | Fix tab introduced in f43946829ce037Nick Mathewson2012-09-10
| | | | | | |
* | | | | | | Be more clear in changes file for 6797.Nick Mathewson2012-09-10
| | | | | | |
* | | | | | | Merge remote-tracking branch 'linus/bug6797'Nick Mathewson2012-09-10
|\ \ \ \ \ \ \
| * | | | | | | Don't follow the NULL pointer.Linus Nordberg2012-09-10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If dirvote_create_microdescriptor() returns NULL, don't use md. Found by "f. tp.". Fixes bug 6797.
* | | | | | | | Merge branch 'bug3155'Nick Mathewson2012-09-10
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename _UseFilteringSSLBufferevents to lose its _. Bug 3155Nick Mathewson2012-09-10
| | | | | | | | |
| * | | | | | | | bug3155 changes fileNick Mathewson2012-09-10
| | | | | | | | |
| * | | | | | | | Hide options beginning with "___" from GETINFO config/namesmeejah2012-09-10
| | | | | | | | |
generated by cgit v1.2.3 (git 2.25.4) at 2024-09-27 07:33:56 +0000