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

changes/bug10929

@@ -0,0 +1,6 @@
+  - Minor bugfixes:
+    - Fix build warnings about missing "a2x" comment when building the
+      manpages from scratch on OpenBSD; OpenBSD calls it "a2x.py".
+      Fixes bug 10929; bugfix on tor-0.2.2.9-alpha. Patch from
+      Dana Koch.
+

configure.ac

@@ -191,7 +191,7 @@ AC_CHECK_PROG([SED],[sed],[sed],[/bin/false])
 
 dnl check for asciidoc and a2x
 AC_PATH_PROG([ASCIIDOC], [asciidoc], none)
-AC_PATH_PROG([A2X], [a2x], none)
+AC_PATH_PROGS([A2X], [a2x, a2x.py], none)
 
 AM_CONDITIONAL(USE_ASCIIDOC, test x$asciidoc = xtrue)