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
Nick Mathewson
eba3f37f17
fix up contrib/checkOptionDocs.pl to match current practice (asciidoc manpage, no "online docs").
2010-08-19 15:58:46 -04:00
Roger Dingledine
1f81474b2e
bump to 0.2.2.15-alpha
2010-08-18 19:16:02 -04:00
Sebastian Hahn
a64e660f0e
Add a rule to detect misplaced labels during check-spaces
2010-08-16 00:46:44 +02:00
Roger Dingledine
69dfd67d90
bump to 0.2.2.14-alpha-dev
2010-07-13 15:48:03 -04:00
Roger Dingledine
06a79233c5
bump to 0.2.2.14-alpha
2010-07-12 21:39:59 -04:00
Roger Dingledine
c359f10e29
bump to 0.2.2.13-alpha-dev
2010-05-05 03:12:33 -04:00
Roger Dingledine
feb8c1b5f6
bump to 0.2.2.13-alpha
2010-04-24 05:43:43 -04:00
Roger Dingledine
95bc91cfc3
windows packaging cleanups from phobos
2010-04-23 20:43:40 -04:00
Roger Dingledine
7231e289dd
windows packaging cleanups from phobos
2010-04-20 20:17:28 -04:00
Roger Dingledine
2c1900ee5e
bump to 0.2.2.12-alpha-dev
2010-04-20 17:56:28 -04:00
Roger Dingledine
18678e5f1e
bump to 0.2.2.12-alpha
2010-04-20 03:56:15 -04:00
Roger Dingledine
84924fcd30
bump to 0.2.2.11-alpha-dev
2010-04-19 06:09:06 -04:00
Roger Dingledine
9cde5a4629
bump to 0.2.2.11-alpha
2010-04-15 11:02:31 -04:00
Roger Dingledine
8aec982f91
Merge branch 'maint-0.2.1'
...
Conflicts:
ChangeLog
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-04-03 22:05:02 -04:00
Roger Dingledine
94dccce3fa
bump to 0.2.1.25
...
it's perfect, let's ship it
2010-03-15 18:08:29 -04:00
Roger Dingledine
4d7d1027ae
fix the tor-exit-notice.html file (bug 1295)
2010-03-08 20:40:21 -05:00
Roger Dingledine
db135e92b4
bump to 0.2.2.10-alpha-dev
...
now's your chance to destabilize it
2010-03-08 00:40:00 -05:00
Roger Dingledine
81b84c0b01
prepare 0.2.2.10-alpha for release
2010-03-07 00:13:12 -05:00
Roger Dingledine
841351e612
clean up the 0.2.1.25 changelog
2010-03-06 22:39:34 -05:00
Nick Mathewson
b006e3279f
Merge remote branch 'origin/maint-0.2.1'
...
Conflicts:
src/common/test.h
src/or/test.c
2010-02-27 17:16:31 -05:00
Nick Mathewson
c3e63483b2
Update Tor Project copyright years
2010-02-27 17:14:21 -05:00
Nick Mathewson
2ab3389ed6
Merge remote branch 'mikeperry/consensus-bw-weights5-merge'
...
Conflicts:
ChangeLog
2010-02-25 16:22:29 -05:00
Nick Mathewson
cf886e296c
Merge remote branch 'sebastian/polipo'
2010-02-25 14:31:53 -05:00
Sebastian Hahn
f31db269a0
Update a section of the exit notice file, give it a changelog.
2010-02-23 20:11:07 +01:00
Sebastian Hahn
e3ba1094a0
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!
2010-02-23 19:55:46 +01:00
Sebastian Hahn
e52353d779
Update polipo build instructions for OS X 10.6
2010-02-23 17:15:47 +01:00
Roger Dingledine
3ae5bee303
bump to 0.2.2.9-alpha-dev
2010-02-22 21:23:06 -05:00
Mike Perry
21f91dcb50
Patch from karsten to detect unnecessary \n's.
...
Also fix a spacing issue.
2010-02-22 16:52:11 -08:00
Roger Dingledine
5e8c611673
prepare for 0.2.2.9-alpha
2010-02-22 00:20:55 -05:00
Roger Dingledine
b9696b96da
bump to 0.2.1.24
2010-02-21 17:27:12 -05:00
Nick Mathewson
715f104eeb
Merge remote branch 'origin/maint-0.2.1'
...
Conflicts:
ChangeLog
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-02-18 12:01:56 -05:00
Nick Mathewson
4a3bd153c0
Bump version to 0.2.1.23-dev
2010-02-18 11:57:47 -05:00
Sebastian Hahn
f164a76f72
Remove legacy files from main source distribution
...
The AUTHORS file was pretty outdated. Its contents moved onto the
people page. Design paper and roadmaps moved to the projects
directory in svn.
2010-02-16 06:41:36 +01:00
Roger Dingledine
33f8dcae6a
prepare for 0.2.1.23
2010-02-12 12:35:40 -05:00
Nick Mathewson
a379a0a488
Merge remote branch 'sebastian/manpage'
2010-01-27 13:24:05 -05:00
Nick Mathewson
f1d1b2f27b
Bump version to 0.2.2.8-alpha-dev
2010-01-27 13:22:20 -05:00
Sebastian Hahn
3efadcd0d5
Move the torify manpage into the doc dir
2010-01-27 11:36:39 +01:00
Roger Dingledine
ff88bc7db8
0.2.2.8-alpha is coming out today sometime
2010-01-26 13:11:58 -05:00
Roger Dingledine
c939509051
bump to 0.2.2.7-alpha
2010-01-19 17:59:33 -05:00
Roger Dingledine
37ca182c7e
Merge branch 'maint-0.2.1' into master
...
Conflicts:
ChangeLog
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
2010-01-19 14:51:39 -05:00
Roger Dingledine
f43f87db5b
bump to 0.2.1.22, and give it a changelog
2010-01-19 14:43:05 -05:00
Roger Dingledine
5201e05fc5
bump to 0.2.1.21 so we can release
2009-12-21 03:22:49 -05:00
Roger Dingledine
01a9cc0413
bump to 0.2.2.6-alpha-dev
2009-11-21 22:57:05 -05:00
Roger Dingledine
1ee580407c
bump to 0.2.2.6-alpha
2009-11-19 14:16:11 -05:00
Nick Mathewson
5ef97ddd42
Merge commit 'origin/maint-0.2.1'
...
Conflicts:
ChangeLog
configure.in
contrib/tor-mingw.nsi.in
src/or/config.c
src/win32/orconfig.h
2009-10-15 12:33:22 -04:00
Roger Dingledine
16dc543851
bump to 0.2.1.20
2009-10-15 12:14:18 -04:00
Nick Mathewson
d407d81a44
Merge commit 'origin/maint-0.2.1'
2009-10-14 21:31:06 -04:00
Nick Mathewson
5fb6d9ac4b
Merge commit 'phobos/tor-dmg-naming-update'
2009-10-14 21:29:40 -04:00
Roger Dingledine
4b55ef26c9
bump to 0.2.2.5-alpha-dev
2009-10-12 15:28:29 -04:00
Andrew Lewman
c0ad690924
updated naming.
2009-10-12 08:36:39 -04:00
Andrew Lewman
ecae6f764a
update naming
2009-10-12 08:36:32 -04:00
Roger Dingledine
255245a289
bump to 0.2.2.5-alpha
2009-10-11 14:59:20 -04:00
Roger Dingledine
a9e0e2f819
bump to 0.2.2.4-alpha
2009-10-10 17:29:44 -04:00
Sebastian Hahn
81895dbd52
Our test script moved from src/or/test to src/test/test.
...
Update the HACKING document and the cross compilation helper
2009-09-23 00:24:43 -04:00
Nick Mathewson
1c2d7732f0
Bump version to 0.2.2.3-alpha-dev
2009-09-23 00:24:37 -04:00
Roger Dingledine
8e3af72ed0
bump to 0.2.2.3-alpha, plus add a changelog for bug 1103
2009-09-22 22:15:56 -04:00
Nick Mathewson
52b75c9a55
Bump version to 0.2.2.2-alpha-dev
2009-09-21 15:51:08 -04:00
Roger Dingledine
5488cda19a
bump to 0.2.2.2-alpha
2009-09-21 01:31:39 -04:00
Roger Dingledine
ed62b031d3
fix grammar / add changelog for the torify commit
2009-09-20 23:24:46 -04:00
Roger Dingledine
61e814af7a
Merge commit 'sebastian/weasel_torify'
2009-09-20 23:11:46 -04:00
Roger Dingledine
2218fd22c5
replace contrib/auto-naming with a readme saying where it went
2009-09-19 06:22:50 -04:00
Roger Dingledine
6750f7e8b1
clarify our rules for assigning the Named flag
2009-09-18 03:05:52 -04:00
Peter Palfrader
5149ae57f1
Fix torify: Do not complain if we cannot find all socksifiers
...
No longer complain if we cannot find both torify and tsocks. As long as
we have one we are happy.
Do not rely on which, it's not POSIX.
Catch error if torsocks fails and print an error message.
2009-09-09 21:37:19 +02:00
phobos
ca5e41afd7
update the README instructions and OS X makefiles
2009-08-30 20:40:02 -04:00
Roger Dingledine
85e22a8adb
bump to 0.2.2.1-alpha-dev
2009-08-27 22:27:31 -04:00
Andrew Lewman
b2b25cf3a2
update fetch-all with dir auth
2009-08-26 20:15:46 -04:00
Roger Dingledine
5308eceef3
bump to 0.2.2.1-alpha
2009-08-26 15:01:43 -04:00
Andrew Lewman
c9b8a4a133
update fetch-all with dir auth
2009-08-13 21:13:09 -04:00
Roger Dingledine
2e1ac18ed1
Merge branch 'maint-0.2.1'
2009-08-10 03:09:20 -04:00
Roger Dingledine
e53ee805a9
directory-archive scripts now fetch from urras too
2009-08-10 03:06:56 -04:00
Nick Mathewson
9da7b22355
Merge commit 'origin/maint-0.2.1'
2009-08-03 12:42:48 -04:00
Andrew Lewman
431202fb63
add geoip file to uninstall
2009-08-03 12:42:29 -04:00
Nick Mathewson
6935c88823
Merge commit 'phobos/osx-uinstaller-maint-0.2.1'
2009-08-03 12:25:35 -04:00
Andrew Lewman
0d12f12cf5
add receipts to be wiped.
2009-08-01 22:41:29 -04:00
Roger Dingledine
69706f99e8
bump to 0.2.1.19
2009-07-28 17:39:51 -04:00
Roger Dingledine
52b142219b
bump to 0.2.1.18
2009-07-24 17:31:04 -04:00
Nick Mathewson
d996b7463e
Bump version to 0.2.1.17-rc-dev
2009-07-07 12:39:35 -04:00
Nick Mathewson
32d4060724
Bump version to 0.2.1.17-rc
2009-07-07 12:22:46 -04:00
Nick Mathewson
da416d9884
Bump version to 0.2.1.16-rc.dev
2009-06-20 21:54:56 -04:00
