summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAge
...
* | | | | | | | | Merge remote branch 'sebastian/osx_compile'Nick Mathewson2011-02-24
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Fix a couple of compile warnings on OS X 10.6Sebastian Hahn2011-02-24
* | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| / / / / / / / | |/ / / / / / /
| * | | | | | | Merge remote branch 'arma/bug2403' into maint-0.2.2Nick Mathewson2011-02-22
| |\ \ \ \ \ \ \
| | * | | | | | | prevent same entry and exit for insane edge caseRoger Dingledine2011-02-22
* | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Add some dollar signs in an attempt to appease older asciidocsNick Mathewson2011-02-22
* | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-02-22
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | Remove doc/spec/Makefile.in from list of generated filesNick Mathewson2011-02-22
* | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-02-22
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Merge remote branch 'public/bug1859_021' into maint-0.2.1Nick Mathewson2011-02-22
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix a remaining bug in Robert's bug1859 fix.Nick Mathewson2010-11-12
| | | * | | | | | | Issues with router_get_by_nickname() (3)Robert Hogan2010-11-12
| | | * | | | | | | Issues with router_get_by_nickname()Robert Hogan2010-11-12
| | | * | | | | | | Issues with router_get_by_nickname()Robert Hogan2010-11-12
* | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | changes file for removing torspec from the tarballRoger Dingledine2011-02-22
| * | | | | | | | | Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2Nick Mathewson2011-02-22
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | / / / / / / | | |_|/ / / / / / | |/| | | | | | |
| | * | | | | | | Merge remote branch 'public/bug2402_nothing' into maint-0.2.1Nick Mathewson2011-02-22
| | |\ \ \ \ \ \ \
| | | * | | | | | | Simplest fix to bug2402: do not include SVN versionsNick Mathewson2011-01-25
| | * | | | | | | | changes file for removing torspec from the tarballRoger Dingledine2011-02-22
* | | | | | | | | | Merge branch 'maint-0.2.2'Roger Dingledine2011-02-22
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'maint-0.2.1' into maint-0.2.2Roger Dingledine2011-02-22
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| | * | | | | | | | prefer https urlsRoger Dingledine2011-02-22
* | | | | | | | | | Merge remote branch 'sebastian/bug2496'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Don't tell Tor client users about missing geoipSebastian Hahn2011-02-06
* | | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Don't let bad DNS make exit policy and declared exit policy get out of syncNick Mathewson2011-02-22
* | | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge branch 'log_domains' into maint-0.2.2Nick Mathewson2011-02-22
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | That shalt also not have a label without a statement.Nick Mathewson2011-02-22
| | * | | | | | | | | | Thou shalt not overflow even stupidly small buffersRobert Ransom2011-02-04
| | * | | | | | | | | | Add a torrc option to report log domainsNick Mathewson2011-01-25
| | * | | | | | | | | | Simplify syntax for negated log domainsNick Mathewson2011-01-25
| | * | | | | | | | | | Add manpage entry for logging domainsNick Mathewson2011-01-25
* | | | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge remote branch 'sebastian/bug2504' into maint-0.2.2Nick Mathewson2011-02-22
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Windows has EACCES, not EACCESSSebastian Hahn2011-02-11
* | | | | | | | | | | | | Add a changes file for the heartbeat codeNick Mathewson2011-02-22
* | | | | | | | | | | | | Tweak some names and comments in asn's heartbeat patchNick Mathewson2011-02-22
* | | | | | | | | | | | | Implement more heartbeat message stuff.George Kadianakis2011-02-22
* | | | | | | | | | | | | Initial heartbeat subsystem commit.Sebastian Hahn2011-02-22
* | | | | | | | | | | | | Merge remote branch 'sebastian/bug2444'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Log which config file we readSebastian Hahn2011-01-27
* | | | | | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-02-22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote branch 'rransom/bug2572' into maint-0.2.2Nick Mathewson2011-02-22
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Don't crash a bridge authority on SIGHUP if it's not in the consensusRobert Ransom2011-02-16
| | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
* | | | | | | | | | | | | | Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-02-21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /