summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)Author
2011-03-14Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-03-14Merge remote branch 'arma/bug2510' into maint-0.2.2Nick Mathewson
2011-03-14Merge branch 'bug2511' into bug2510Roger Dingledine
2011-03-14Merge remote branch 'arma/bug2716' into maint-0.2.2Nick Mathewson
2011-03-13fix two issues pointed out by nickmRoger Dingledine
2011-03-13we're not reachable if we don't have a routerinfo yetRoger Dingledine
2011-03-13fix one more typoRoger Dingledine
2011-03-12Tweak bug2716 patch a littleNick Mathewson
Name the magic value "10" rather than re-deriving it. Comment more. Use the pattern that works for periodic timers, not the pattern that doesn't work. ;)
2011-03-11Merge branch 'hsdir_assignment' into maint-0.2.2Nick Mathewson
2011-03-11Clarify threat description and avoid negative uptimes.Nick Mathewson
2011-03-11improve accuracy for when a relay went unreachableRoger Dingledine
2011-03-11Merge commit 'sebastian/bug2663' into maint-0.2.2Roger Dingledine
2011-03-11Use observed instead of declared uptime for HSDirSebastian Hahn
It is important to verify the uptime claim of a relay instead of just trusting it, otherwise it becomes too easy to blackhole a specific hidden service. rephist already has data available that we can use here. Bugfix on 0.2.0.10-alpha.
2011-03-08Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
2011-03-08move to march 2011 geoip fileRoger Dingledine
2011-03-08Merge remote branch 'sebastian/bug2250' into maint-0.2.2Nick Mathewson
2011-03-08Merge remote branch 'sebastian/bug1035' into maint-0.2.2Nick Mathewson
2011-03-08Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-03-08Avoid crash in any_pending_bridge_descriptor_fetchesNick Mathewson
This is based on shitlei's fix for bug2629, with extra parens removed. Fixes bug 2629, bugfix on 0.2.1.2-alpha.
2011-03-07Merge remote branch 'sebastian/bug2660' into maint-0.2.2Nick Mathewson
2011-03-07Fix log message when we have too few dirauthsSebastian Hahn
The calculation of when to send the logmessage was correct, but we didn't give the correct number of relays required: We want more than half of all authorities we know about. Fixes bug 2663.
2011-03-06Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
2011-03-06Merge branch 'real_ipv6_fix' into maint-0.2.1Nick Mathewson
2011-03-06Oops, here's the *REAL* fix for the ipv6 issueNick Mathewson
We need to _REJECT_ descriptors with accept6/reject6 lines. If we let them onto the network , other un-upgraded tors will crash.
2011-03-06Merge branch 'careful_with_all_descs' into maint-0.2.1Nick Mathewson
2011-03-06Revert "Disallow reject6 and accept6 lines in descriptors"Nick Mathewson
This reverts commit b3918b3bbbfa9097246d63746c8b540eff2ec8e8.
2011-03-06Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson
Conflicts: src/or/policies.c
2011-03-06exit_policy_is_general_exit is IPv4 only; it should admit it.Nick Mathewson
2011-03-06Merge branch 'maint-0.2.1' into maint-0.2.2Sebastian Hahn
2011-03-06Disallow reject6 and accept6 lines in descriptorsSebastian Hahn
This fixes a remotely triggerable assert on directory authorities, who don't handle descriptors with ipv6 contents well yet. We will want to revert this once we're ready to handle ipv6. Issue raised by lorth on #tor, who wasn't able to use Tor anymore. Analyzed with help from Christian Fromme. Fix suggested by arma. Bugfix on 0.2.1.3-alpha.
2011-03-05Fix setting target port in get_interface_address6Sebastian Hahn
We want to use the discard port correctly, so a htons() was missing. Also we need to set it correctly depending on address family. Review provided by danieldg
2011-03-05Fix connect() failures in get_interface_address6()Sebastian Hahn
The third argument for connect should be dependent on the address family. Issue spotted by piebeer who also wrote the patch.
2011-03-04Do not serve encrypt-only descriptors with the "all" request. Reported by ↵Nick Mathewson
piebeer
2011-03-01Avoid spurious bwhist parsing failuresNick Mathewson
This should fix a bug that special ran into, where if your state file didn't record period maxima, it would never decide that it had successfully parsed itself unless you got lucky with your uninitialized-variable values. This patch also tries to improve error messags in the case where a maximum value legitimately doesn't parse.
2011-03-01Tweak the bug2250 fix slightlySebastian Hahn
Rename the _UsingTestingTorNetwork hidden option to _UsingTestNetworkDefaults (thanks Nick for the suggestion) and added a changes file.
2011-02-26clarify an assertSebastian Hahn
also log about running changes, even on a bridge authority.
2011-02-26Fix GETINFO config-text for private networksSebastian Hahn
In private networks, the defaults for some options are changed. This means that in options_validate(), where we're testing that the defaults are what we think they are, we fail. Use a workaround by setting a hidden configuration option _UsingTestingTorNetwork when we have altered the configuration this way, so that options_validate() can do the right thing. Fixes bug 2250, bugfix on 0.2.1.2-alpha (the version introducing private network options).
2011-02-25Merge branch 'bug1863_bwhist' into maint-0.2.2Nick Mathewson
2011-02-24Fix two potential bugs in the bug1863 code.Karsten Loesing
2011-02-22prevent same entry and exit for insane edge caseRoger Dingledine
2011-02-22Merge remote branch 'public/bug1859_021' into maint-0.2.1Nick Mathewson
2011-02-22Merge remote branch 'public/bug2402_nothing' into maint-0.2.1Nick Mathewson
2011-02-22Don't let bad DNS make exit policy and declared exit policy get out of syncNick Mathewson
Patch from "postman" on trac. Fixes bg 2366. Bug on 0.1.2.5-alpha.
2011-02-22Merge branch 'log_domains' into maint-0.2.2Nick Mathewson
2011-02-22That shalt also not have a label without a statement.Nick Mathewson
2011-02-22Merge remote branch 'sebastian/bug2504' into maint-0.2.2Nick Mathewson
2011-02-16Don't crash a bridge authority on SIGHUP if it's not in the consensusRobert Ransom
Fixes bug 2572.
2011-02-11Windows has EACCES, not EACCESSSebastian Hahn
Once again spotted by mobmix Also add a changes file for the fix
2011-02-11Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
2011-02-10fix the other half of bug 1074Roger Dingledine