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
commite4a6d9d5a916038f3981c2fd2d51fb0ff9979f1b (patch)
tree17e61c0b53ab139ec1dd10c777d36073a1c70d32 /scripts
parent68f8250cbb6f1844e7f16f5f1bc8063b8bbfdf14 (diff)
parent8a0f530adffc4dbdb1afa065b214dd282f8bca8f (diff)
downloadtor-e4a6d9d5a916038f3981c2fd2d51fb0ff9979f1b.tar.gz
tor-e4a6d9d5a916038f3981c2fd2d51fb0ff9979f1b.zip
Merge branch 'maint-0.3.5' into maint-0.4.2
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.
#