Commit e4a6d9d5 authored by Nick Mathewson's avatar Nick Mathewson 👁
Browse files

Merge branch 'maint-0.3.5' into maint-0.4.2

parents 68f8250c 8a0f530a
####
# 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
......
#!/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.
# #
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment