summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* add --enable-static-tor to our configure scriptstatic-torJacob Appelbaum2011-03-24
| | | | This implements the feature request in bug #2702
* Fix libevent autoconf bug #2698Jacob Appelbaum2011-03-24
|
* Merge branch 'master' of git://git.torproject.org/git/torJacob Appelbaum2011-03-09
|\
| * Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-09
| |\
| | * oops. I got the bug number wrong.Nick Mathewson2011-03-09
| | |
| * | oops. I got the bug number wrong.Nick Mathewson2011-03-09
| | |
| * | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-09
| |\ \ | | |/
| | * openSUSE initscript create /var/run/tor fixes Ticket #2573Andreas Stieger2011-03-09
| | | | | | | | | | | | (changes file added by nickm)
| * | forward-port the 0.2.2.23-alpha changelogRoger Dingledine2011-03-08
| | |
| * | Merge branch 'maint-0.2.2'Roger Dingledine2011-03-08
| |\ \ | | |/
| | * Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-03-08
| | |\
| | | * move to march 2011 geoip fileRoger Dingledine2011-03-08
| | | |
| * | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-08
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Trivial conflicts fixed in or.h Conflicts: src/or/or.h
| | * | Merge remote branch 'sebastian/bug2250' into maint-0.2.2Nick Mathewson2011-03-08
| | |\ \
| | | * | Tweak the bug2250 fix slightlySebastian Hahn2011-03-01
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename the _UsingTestingTorNetwork hidden option to _UsingTestNetworkDefaults (thanks Nick for the suggestion) and added a changes file.
| | | * | Fix GETINFO config-text for private networksSebastian Hahn2011-02-26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * | | | Merge branch 'maint-0.2.2'Roger Dingledine2011-03-08
| |\ \ \ \ | | |/ / /
| | * | | steps roger takes when making a new releaseRoger Dingledine2011-03-08
| | | | |
| * | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-08
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved trivial one-line conflicts. Conflicts: src/or/dirserv.c src/or/rephist.c
| | * | | Merge remote branch 'sebastian/bug1035' into maint-0.2.2Nick Mathewson2011-03-08
| | |\ \ \
| | | * | | clarify an assertSebastian Hahn2011-02-26
| | | | | | | | | | | | | | | | | | | | | | | | also log about running changes, even on a bridge authority.
| | | * | | Routers count as down when they change ORPort, tooSebastian Hahn2011-02-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rransom noticed that a change of ORPort is just as bad as a change of IP address from a client's perspective, because both mean that the relay is not available to them while the new information hasn't propagated. Change the bug1035 fix accordingly. Also make sure we don't log a bridge's IP address (which might happen when we are the bridge authority).
| | | * | | Fix spelling and an unused #defineSebastian Hahn2011-02-07
| | | | | | | | | | | | | | | | | | | | | | | | both noticed by rransom
| | | * | | Fix compile without warnings on OS X 10.6Sebastian Hahn2010-12-27
| | | | | |
| | | * | | Handle negative run lengths in wfu/mtbf calculationsNick Mathewson2010-11-22
| | | | | |
| | | * | | Treat routers whose IPs have changed as having been down for MTBF/routerinfoNick Mathewson2010-11-22
| | | | | | | | | | | | | | | | | | | | | | | | calculation purposes.
| | | * | | Remove an incorrect comment in connection_or_check_valid_tls_handshakeNick Mathewson2010-11-22
| | | | | |
| | * | | | update spec locationsRoger Dingledine2011-03-08
| | | | | |
| * | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-08
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-03-08
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Avoid crash in any_pending_bridge_descriptor_fetchesNick Mathewson2011-03-08
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is based on shitlei's fix for bug2629, with extra parens removed. Fixes bug 2629, bugfix on 0.2.1.2-alpha.
| | * | | | make nickm's proposed convention from 2003 be gospelRoger Dingledine2011-03-08
| | | | | |
| * | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-07
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge remote branch 'sebastian/bug2660' into maint-0.2.2Nick Mathewson2011-03-07
| | |\ \ \ \
| | | * | | | Fix setting target port in get_interface_address6Sebastian Hahn2011-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * | | | Fix connect() failures in get_interface_address6()Sebastian Hahn2011-03-05
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The third argument for connect should be dependent on the address family. Issue spotted by piebeer who also wrote the patch.
| * | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-06
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/routerparse.c
| | * | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-03-06
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge branch 'real_ipv6_fix' into maint-0.2.1Nick Mathewson2011-03-06
| | | |\ \ \ \
| | | | * | | | Oops, here's the *REAL* fix for the ipv6 issueNick Mathewson2011-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to _REJECT_ descriptors with accept6/reject6 lines. If we let them onto the network , other un-upgraded tors will crash.
| | | | * | | | Revert "Disallow reject6 and accept6 lines in descriptors"Nick Mathewson2011-03-06
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b3918b3bbbfa9097246d63746c8b540eff2ec8e8.
| | | * | | | | Merge branch 'careful_with_all_descs' into maint-0.2.1Nick Mathewson2011-03-06
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | changes file for careful_with_all_descsNick Mathewson2011-03-06
| | | | | | | |
| | | | * | | | Do not serve encrypt-only descriptors with the "all" request. Reported by ↵Nick Mathewson2011-03-04
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | piebeer
| * | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-03-06
| |\ \ \ \ \ \ \ | | |/ / / / / /
| | * | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-03-06
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/or/policies.c
| | | * | | | | exit_policy_is_general_exit is IPv4 only; it should admit it.Nick Mathewson2011-03-06
| | | | | | | |
| | | * | | | | Changes file for ipv6 parsing issueNick Mathewson2011-03-06
| | | | | | | |
| | * | | | | | Merge branch 'maint-0.2.1' into maint-0.2.2Sebastian Hahn2011-03-06
| | |\ \ \ \ \ \ | | | |/ / / / / | | | | | / / / | | | |_|/ / / | | |/| | | |
| | | * | | | Disallow reject6 and accept6 lines in descriptorsSebastian Hahn2011-03-06
| | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.