Merge remote-tracking branch 'origin/maint-0.2.4'

changes/bug7143

@@ -0,0 +1,4 @@
+  o Minor bugfixes (build):
+    - Add the old src/or/micro-revision.i filename to CLEANFILES.
+      On the off chance that somebody has one, it will go away as soon
+      as they run "make clean". Fix for bug 7143; bugfix on 0.2.4.1-alpha.

src/or/include.am

@@ -188,6 +188,6 @@ src/or/or_sha1.i: $(src_or_tor_SOURCES) $(src_or_libtor_a_SOURCES) $(ORHEADERS)
 	  touch src/or/or_sha1.i; \
 	fi
 
-CLEANFILES+= micro-revision.i
+CLEANFILES+= micro-revision.i src/or/micro-revision.i
 
 FORCE: