Merge commit 'sebastian/distcheck'

doc/Makefile.am

@@ -77,5 +77,5 @@ torify.html : torify.html.in
 tor-gencert.html : tor-gencert.html.in
 tor-resolve.html : tor-resolve.html.in
 
-CLEANFILES = $(asciidoc_product)
+CLEANFILES = $(asciidoc_product) config.log
 DISTCLEANFILES = $(html_in) $(man_in)

src/or/Makefile.am

@@ -82,5 +82,7 @@ or_sha1.i: $(tor_SOURCES)
 	  touch or_sha1.i; \
 	fi
 
+CLEANFILES = micro-revision.i
+
 #Dummy target to ensure that micro-revision.i _always_ gets built.
 FORCE: