aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-08-11 10:44:40 -0400
committerNick Mathewson <nickm@torproject.org>2020-08-11 10:44:40 -0400
commit262ddfee7a8816b9f7990467df0e495e27f387db (patch)
treebeac11825fe757f2d57df241230d57ac6ce452a2 /scripts
parentf3fcc89d055811065bd9fe723b4d71b755b82edc (diff)
parente4a6d9d5a916038f3981c2fd2d51fb0ff9979f1b (diff)
downloadtor-262ddfee7a8816b9f7990467df0e495e27f387db.tar.gz
tor-262ddfee7a8816b9f7990467df0e495e27f387db.zip
Merge branch 'maint-0.4.2' into maint-0.4.3
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/ci/ci-driver.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 50728a137e..bede68baa8 100755
--- 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.
#