tor

commit e4a6d9d5a916038f3981c2fd2d51fb0ff9979f1b
parent 68f8250cbb6f1844e7f16f5f1bc8063b8bbfdf14
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 11 Aug 2020 10:44:40 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

Diffstat:
M
.gitlab-ci.yml
 | 
5
+++++
M
scripts/ci/ci-driver.sh
 | 
5
+++++

2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -1,3 +1,8 @@
+####
+# DO NOT EDIT THIS FILE IN MASTER.  ONLY EDIT IT IN THE OLDEST SUPPORTED
+# BRANCH, THEN MERGE FORWARD.
+####
+
 # This file controls how gitlab validates Tor commits and merge requests.
 #
 # It is primarily based on a set of scripts and configurations by
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+####
+# DO NOT EDIT THIS FILE IN MASTER.  ONLY EDIT IT IN THE OLDEST SUPPORTED
+# BRANCH, THEN MERGE FORWARD.
+####
+
 # This script is used to build Tor for continuous integration.  It should
 # be kept the same for all supported Tor versions.
 #