Merge branch 'maint-0.3.5' into maint-0.4.2

.gitlab-ci.yml

+####
+# 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

scripts/ci/ci-driver.sh

 #!/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.
 #