tor

commit f8dad5a079ac356ef72f14cfddca2d81fd824102
parent 8b108935b25fb7421443a070415a677f9dcde325
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 26 Jun 2018 09:21:59 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

Diffstat:
A
changes/feature26372_029
 | 
4
++++
M
configure.ac
 | 
6
+++++-

2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/changes/feature26372_029 b/changes/feature26372_029
@@ -0,0 +1,4 @@
+  o Minor features (compilation):
+
+    - When building Tor, prefer to use Python 3 over Python 2, and more
+      recent (contemplated) versions over older ones. Closes ticket 26372.
diff --git a/configure.ac b/configure.ac
@@ -268,7 +268,11 @@ AM_PROG_CC_C_O
 AC_PROG_CC_C99
 
 AC_ARG_VAR([PYTHON], [path to Python binary])
-AC_CHECK_PROGS(PYTHON, [python python2 python2.7 python3 python3.3])
+AC_CHECK_PROGS(PYTHON, [ \
+	python3 \
+	python3.8 python3.7 python3.6 python3.5 python3.4 \
+	python \
+	python2 python2.7])
 if test "x$PYTHON" = "x"; then
   AC_MSG_WARN([Python unavailable; some tests will not be run.])
 fi