Commit Graph

721 Commits

Author SHA1 Message Date
Roger Dingledine
a58d9e6045 bump to 0.2.3.8-alpha 2011-11-22 18:29:57 -05:00
Nick Mathewson
c58f4a8652 Merge remote-tracking branch 'origin/maint-0.2.2' 2011-10-30 21:28:36 -04:00
Erinn Clark
a6ea34977b remove absolute path from contrib/package_nsis-mingw.sh in order to make it easier to automatically build tor expert bundle 2011-10-31 00:52:52 +00:00
Roger Dingledine
c2d03beb65 blurb and version bump for 0.2.3.7-alpha 2011-10-30 18:39:49 -04:00
Nick Mathewson
00a0de8508 Bump version to 0.2.3.6-alpha-dev 2011-10-28 18:05:17 -04:00
Roger Dingledine
48bafb47ac bump maint-0.2.2 to 0.2.2.34-dev 2011-10-27 20:50:48 -04:00
Roger Dingledine
1a160ae523 bump to 0.2.3.6-alpha 2011-10-26 20:33:23 -04:00
Roger Dingledine
2e295ae46e bump to 0.2.3.5-alpha-dev 2011-10-23 13:38:12 -04:00
Roger Dingledine
1fac96f4c6 bump to 0.2.3.5-alpha 2011-09-28 18:25:16 -04:00
Roger Dingledine
6a799c10ee bump to 0.2.3.4-alpha-dev 2011-09-13 22:04:47 -04:00
Roger Dingledine
0b0f7d792c bump to 0.2.3.4-alpha 2011-09-13 19:59:06 -04:00
Roger Dingledine
7ca16affb5 bump to 0.2.3.3-alpha-dev 2011-09-02 07:41:55 -04:00
Roger Dingledine
f68cd4a175 bump to 0.2.3.3-alpha 2011-09-02 06:23:28 -04:00
Nick Mathewson
99348ce831 Bump version to 0.2.3.2-alpha-dev 2011-07-18 17:56:47 -04:00
Roger Dingledine
8cdec1e156 bump to 0.2.3.2-alpha 2011-07-18 13:20:54 -04:00
Nick Mathewson
bb105ef1f6 Enhance findMergedChanges to allow looking at non-release targets 2011-07-18 12:43:39 -04:00
Nick Mathewson
08e6bd0ed1 Increment version to 0.2.3.1-alpha-dev 2011-05-05 15:15:20 -04:00
Nick Mathewson
5ed719fd6c Increment version to 0.2.3.1-alpha 2011-05-05 13:42:03 -04:00
Nick Mathewson
751e408055 Make findMergedChanges.pl print a usage msg when started with no args
Otherwise I need to figure out what it does and how to make it do it
every time I want to use it.  It did that unixy thing where running
it with no arguments printed nothing and returned.
2011-04-29 15:27:44 -04:00
Nick Mathewson
19baca4837 Merge remote branch 'origin/maint-0.2.2' 2011-03-09 16:20:14 -05:00
Andreas Stieger
f31ba6a356 openSUSE initscript create /var/run/tor fixes Ticket #2573
(changes file added by nickm)
2011-03-09 16:18:44 -05:00
Nick Mathewson
90f9caf423 Add a perl script to find changes files that have already been merged into release-0.2.2 2011-02-21 14:22:56 -05:00
Nick Mathewson
c417210ff3 Merge remote branch 'origin/maint-0.2.2' 2011-01-26 11:18:32 -05:00
Nick Mathewson
58dfebbcb4 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2 2011-01-26 11:18:19 -05:00
Andrew Lewman
741ef2a8cd fix the links in the exit-list notice we give out to users. 2011-01-26 11:15:09 -05:00
Nick Mathewson
ebb287c75d Backport current tor-exit-notice to 0.2.1 2011-01-26 11:15:09 -05:00
Taylor R Campbell
0f728e200a trivial make-signature.sh patch 2011-01-15 23:03:20 -05:00
Nick Mathewson
6ccb16438a Add a make-signature.sh script. 2011-01-15 15:00:41 -05:00
Nick Mathewson
8730884ebe Merge remote branch 'origin/maint-0.2.2' 2011-01-03 11:53:28 -05:00
Nick Mathewson
f1de329e78 Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
Conflicts:
	src/common/test.h
	src/or/test.c
2011-01-03 11:51:17 -05:00
Nick Mathewson
1a07348a50 Bump copyright statements to 2011 2011-01-03 11:50:39 -05:00
Roger Dingledine
713db8dbfa bump to 0.2.2.19-alpha 2010-11-21 18:00:12 -05:00
Roger Dingledine
c643e0527c new development version 2010-11-16 14:45:40 -05:00
Roger Dingledine
e1e7988537 bump to 0.2.2.18-alpha 2010-11-16 00:20:49 -05:00
Nick Mathewson
8c2affe637 Merge remote branch 'origin/maint-0.2.2'
Conflicts:
	src/or/config.c
	src/or/cpuworker.c
2010-11-15 14:14:13 -05:00
Nick Mathewson
433a98131a Merge remote branch 'sebastian/manpagefixups' into maint-0.2.2 2010-11-15 14:07:00 -05:00
Nick Mathewson
223fc208f6 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.
2010-11-11 14:22:48 -05:00
Nick Mathewson
2b4ed1d07e Merge remote branch 'origin/maint-0.2.2'
Conflicts:
	configure.in
2010-11-11 13:59:18 -05:00
Sebastian Hahn
40fd0c1ca1 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.
2010-11-10 15:48:25 +01:00
Sebastian Hahn
12c4bb6b62 Change checkOptionDocs.pl to be case sensitive 2010-11-10 15:48:25 +01:00
Sebastian Hahn
fcdf1470c0 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.
2010-11-10 04:04:29 +01:00
Roger Dingledine
6e00877fa3 bump to 0.2.2.17-alpha-dev 2010-10-01 04:59:11 -04:00
Roger Dingledine
28b55c92d5 Merge branch 'maint-0.2.2' 2010-09-30 22:02:54 -04:00
Erinn Clark
dadd9608d2 improve rpm init script by borrowing from Debian 2010-09-30 21:48:29 -04:00
Erinn Clark
951340f516 AUTHORS doesn't exist, so stop trying to cp it. Add 'sudo' to a mv that needs higher permissions. 2010-09-30 21:48:28 -04:00
Roger Dingledine
a3f488a887 bump to 0.2.2.17-alpha 2010-09-30 17:49:11 -04:00
Nick Mathewson
83f9667fe8 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. :)
2010-09-24 15:15:07 -04:00
Roger Dingledine
85cad94221 bump to 0.2.2.16-alpha-dev 2010-09-17 05:07:59 -04:00
Roger Dingledine
61e0079ab2 best tor ever! 2010-09-17 02:06:34 -04:00
Nick Mathewson
89b424037b Bump version to 0.2.2.15-alpha-dev 2010-08-19 16:24:31 -04:00