aboutsummaryrefslogtreecommitdiff
path: root/contrib
Commit message (Expand)AuthorAge
* Merge remote branch 'origin/maint-0.2.2'Nick Mathewson2011-01-03
|\
| * Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2•••Conflicts: src/common/test.h src/or/test.c Nick Mathewson2011-01-03
| |\
| | * Bump copyright statements to 2011Nick Mathewson2011-01-03
| | * windows packaging cleanups from phobosRoger Dingledine2010-04-23
| * | bump to 0.2.2.19-alphaRoger Dingledine2010-11-21
| * | new development versionRoger Dingledine2010-11-16
| * | bump to 0.2.2.18-alphaRoger Dingledine2010-11-16
* | | Merge remote branch 'origin/maint-0.2.2'•••Conflicts: src/or/config.c src/or/cpuworker.c Nick Mathewson2010-11-15
|\| |
| * | Merge remote branch 'sebastian/manpagefixups' into maint-0.2.2Nick Mathewson2010-11-15
| |\ \
| | * | Remove the torrc.complete file.•••We haven't been keeping it up to date, and the manpage exists as a replacement for users who want an overview of all available options. Sebastian Hahn2010-11-10
| | * | Change checkOptionDocs.pl to be case sensitiveSebastian Hahn2010-11-10
* | | | Split long lines in configure.in and Makefile.am files•••Having very long single lines with lots and lots of things in them tends to make files hard to diff and hard to merge. Since our tools are one-line-at-a-time, we should try to construct lists that way too, within reason. This incidentally turned up a few headers in configure.in that we were for some reason searching for twice. Nick Mathewson2010-11-11
* | | | Merge remote branch 'origin/maint-0.2.2'•••Conflicts: configure.in Nick Mathewson2010-11-11
|\| | |
| * | | Remove everything related to os x expert package•••We decided to no longer ship expert packages for OS X because they're a lot of trouble to keep maintained and confuse users. For those who want a tor on OS X without Vidalia, macports is a fine option. Alternatively, building from source is easy, too. The polipo stuff that is still required for the Vidalia bundle build can now be found in the torbrowser repository, git://git.torproject.org/torbrowser.git. Sebastian Hahn2010-11-10
| |/ /
| * | bump to 0.2.2.17-alpha-devRoger Dingledine2010-10-01
* | | Merge branch 'maint-0.2.2'Roger Dingledine2010-09-30
|\| |
| * | improve rpm init script by borrowing from DebianErinn Clark2010-09-30
| * | AUTHORS doesn't exist, so stop trying to cp it. Add 'sudo' to a mv that needs...Erinn Clark2010-09-30
| * | bump to 0.2.2.17-alphaRoger Dingledine2010-09-30
* | | Bump the Tor version in master to 0.2.3.0-alpha-dev•••0.2.2.x development will continue in branch maint-0.2.2. master is now out of feature freeze. Let's not go crazy right away. :) Nick Mathewson2010-09-24
|/ /
* | bump to 0.2.2.16-alpha-devRoger Dingledine2010-09-17
* | best tor ever!Roger Dingledine2010-09-17
* | Bump version to 0.2.2.15-alpha-devNick Mathewson2010-08-19
* | fix up contrib/checkOptionDocs.pl to match current practice (asciidoc manpage...Nick Mathewson2010-08-19
* | bump to 0.2.2.15-alphaRoger Dingledine2010-08-18
* | Add a rule to detect misplaced labels during check-spacesSebastian Hahn2010-08-16
* | bump to 0.2.2.14-alpha-devRoger Dingledine2010-07-13
* | bump to 0.2.2.14-alphaRoger Dingledine2010-07-12
* | bump to 0.2.2.13-alpha-devRoger Dingledine2010-05-05
* | bump to 0.2.2.13-alphaRoger Dingledine2010-04-24
* | windows packaging cleanups from phobosRoger Dingledine2010-04-20
* | bump to 0.2.2.12-alpha-devRoger Dingledine2010-04-20
* | bump to 0.2.2.12-alphaRoger Dingledine2010-04-20
* | bump to 0.2.2.11-alpha-devRoger Dingledine2010-04-19
* | bump to 0.2.2.11-alphaRoger Dingledine2010-04-15
* | Merge branch 'maint-0.2.1'•••Conflicts: ChangeLog configure.in contrib/tor-mingw.nsi.in src/win32/orconfig.h Roger Dingledine2010-04-03
|\|
| * bump to 0.2.1.25•••it's perfect, let's ship it Roger Dingledine2010-03-15
| * clean up the 0.2.1.25 changelogRoger Dingledine2010-03-06
* | fix the tor-exit-notice.html file (bug 1295)Roger Dingledine2010-03-08
* | bump to 0.2.2.10-alpha-dev•••now's your chance to destabilize it Roger Dingledine2010-03-08
* | prepare 0.2.2.10-alpha for releaseRoger Dingledine2010-03-07
* | Merge remote branch 'origin/maint-0.2.1'•••Conflicts: src/common/test.h src/or/test.c Nick Mathewson2010-02-27
|\|
| * Update Tor Project copyright yearsNick Mathewson2010-02-27
| * bump to 0.2.1.24Roger Dingledine2010-02-21
* | Merge remote branch 'mikeperry/consensus-bw-weights5-merge'•••Conflicts: ChangeLog Nick Mathewson2010-02-25
|\ \
| * | Patch from karsten to detect unnecessary \n's.•••Also fix a spacing issue. Mike Perry2010-02-22
* | | Merge remote branch 'sebastian/polipo'Nick Mathewson2010-02-25
|\ \ \
| * | | Update polipo build instructions for OS X 10.6Sebastian Hahn2010-02-23
* | | | Update a section of the exit notice file, give it a changelog.Sebastian Hahn2010-02-23
* | | | Fix some urls in the exit notice•••Patch by Christian Kujau to fix some links in the exit notice file (the file you'd use for your DirPortFrontPage), as well as making the file xhtml compatible. Thanks! Sebastian Hahn2010-02-23
|/ / /