aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-03-11Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
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-11Merge commit 'sebastian/bug2663' into maint-0.2.2Roger Dingledine
2011-03-11Merge branch 'maint-0.2.2'Roger Dingledine
2011-03-11Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine
2011-03-11put the 0.2.1.30 changes into releasenotesRoger 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-10Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-10Add a step to the release process: tell trac about the version.Nick Mathewson
2011-03-09Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-09oops. I got the bug number wrong.Nick Mathewson
2011-03-09oops. I got the bug number wrong.Nick Mathewson
2011-03-09Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-09openSUSE initscript create /var/run/tor fixes Ticket #2573Andreas Stieger
(changes file added by nickm)
2011-03-08forward-port the 0.2.2.23-alpha changelogRoger Dingledine
2011-03-08Merge branch 'maint-0.2.2'Roger Dingledine
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 'origin/maint-0.2.2'Nick Mathewson
Trivial conflicts fixed in or.h Conflicts: src/or/or.h
2011-03-08Merge branch 'maint-0.2.2'Roger Dingledine
2011-03-08Merge remote branch 'sebastian/bug2250' into maint-0.2.2Nick Mathewson
2011-03-08Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
Resolved trivial one-line conflicts. Conflicts: src/or/dirserv.c src/or/rephist.c
2011-03-08steps roger takes when making a new releaseRoger Dingledine
2011-03-08Merge remote branch 'sebastian/bug1035' into maint-0.2.2Nick Mathewson
2011-03-08update spec locationsRoger Dingledine
2011-03-08Merge remote branch 'origin/maint-0.2.2'Nick 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-08make nickm's proposed convention from 2003 be gospelRoger Dingledine
2011-03-07Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
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.2'Nick Mathewson
Conflicts: src/or/routerparse.c
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-06changes file for careful_with_all_descsNick 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.2'Nick Mathewson
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-06Changes file for ipv6 parsing issueNick 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-04Merge remote branch 'origin/maint-0.2.2'Nick Mathewson
2011-03-04Do not serve encrypt-only descriptors with the "all" request. Reported by ↵Nick Mathewson
piebeer