Merge remote branch 'origin/maint-0.2.2'

Conflicts:
	configure.in
This commit is contained in:
Nick Mathewson
2010-11-11 13:59:18 -05:00
39 changed files with 14 additions and 1738 deletions
+5
View File
@@ -0,0 +1,5 @@
o Removed features:
- Remove everything related to building the expert bundle for OS X. It
has confused many users, doesn't work right on OS X 10.6, and is hard
to get rid of once installed. Resolves bug 1274.