Merge remote branch 'origin/maint-0.2.2'

Conflicts:
	Makefile.am

Makefile.am

@@ -4,8 +4,8 @@
 # See LICENSE for licensing information
 
 # "foreign" means we don't follow GNU package layout standards
-# 1.6 means we require automake vesion 1.6
-AUTOMAKE_OPTIONS = foreign 1.6
+# 1.7 means we require automake vesion 1.7
+AUTOMAKE_OPTIONS = foreign 1.7
 
 SUBDIRS = src doc contrib
 

changes/bug2305

@@ -0,0 +1,5 @@
+  o Build changes
+    - Tor does not build packages correctly with Automake 1.6 and earlier;
+      added a check to Makefile.am to make sure that we're building with
+      Automake 1.7 or later.
+