9 Commits

Author	SHA1	Message	Date
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
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
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
Sebastian Hahn	e52353d779	Update polipo build instructions for OS X 10.6	2010-02-23 17:15:47 +01:00
phobos	ca5e41afd7	update the README instructions and OS X makefiles	2009-08-30 20:40:02 -04:00
Andrew Lewman	2ee191e267	Update directions, copyrights, and clarify licenses of polipo ... contributions. svn:r13490	2008-02-13 15:08:45 +00:00
Andrew Lewman	4034cff4ba	Quick readme for those wondering how to build and use polipo with Tor. ... svn:r11588	2007-09-23 01:49:10 +00:00