[tor-commits] [chutney/master] Travis: Run 0.2.9 on Xenial

[teor at torproject.org]

commit f4ecd5876a9aa671afdcbdf5b9a2adb1aa7b57f5
Author: teor <teor at torproject.org>
Date:   Fri Dec 20 09:14:43 2019 +1000

    Travis: Run 0.2.9 on Xenial
    
    Bionic has an OpenSSL version mismatch between Tor's build, and
    Travis' image.
    
    Part of 32630.
---
 .travis.yml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6bdb518..2115e53 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -68,12 +68,16 @@ matrix:
     ## If the deb.torproject.org repositories are removed, we will fall back to
     ## Ubuntu security's tor version (currently 0.2.9.14). We might want to
     ## automatically fail the job if we can't get a newer tor, see #29741.
+    ##
     ## The current tor versions in Ubuntu are on this page:
     ## https://packages.ubuntu.com/search?keywords=tor&searchon=names&exact=1
-    - addons:
+    ##
+    ## We run 0.2.9 on Xenial, because Bionic has an OpenSSL version mismatch
+    - dist: xenial
+      addons:
         apt:
           sources:
-            - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.2.9.x-bionic main'
+            - sourceline: 'deb https://deb.torproject.org/torproject.org tor-nightly-0.2.9.x-xenial main'
               key_url: 'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
           packages:
             - shellcheck