nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 22:03:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.2' into maint-0.4.3

Browse Source
This commit is contained in:
Nick Mathewson 2020-08-11 10:44:40 -04:00
commit 262ddfee7a
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@ -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. # This file controls how gitlab validates Tor commits and merge requests.
# #
# It is primarily based on a set of scripts and configurations by # It is primarily based on a set of scripts and configurations by

5
scripts/ci/ci-driver.sh
View File

@ -1,5 +1,10 @@
#!/bin/bash #!/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 # This script is used to build Tor for continuous integration. It should
# be kept the same for all supported Tor versions. # be kept the same for all supported Tor versions.
# #