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.3.5' into maint-0.4.5

Browse Source
This commit is contained in:
David Goulet 2021-11-03 09:47:43 -04:00
commit 1e3e921d7d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/asciidoc-helper.sh
View File

@ -12,7 +12,8 @@ if [ $# != 3 ]; then
exit 1; exit 1;
fi fi
export SOURCE_DATE_EPOCH=$(git show --no-patch --format='%ct') SOURCE_DATE_EPOCH="$(git show --no-patch --format='%ct')"
export SOURCE_DATE_EPOCH
output=$3 output=$3
@ -21,7 +22,7 @@ if [ "$1" = "html" ]; then
base=${output%%.html.in} base=${output%%.html.in}
if [ "$2" != none ]; then if [ "$2" != none ]; then
TZ=UTC "$2" -f "$(dirname $0)/nofooter.conf" -d manpage -o "$output" "$input"; TZ=UTC "$2" -f "$(dirname "$0")/nofooter.conf" -d manpage -o "$output" "$input";
else else
echo "=================================="; echo "==================================";
echo; echo;

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

@ -287,7 +287,7 @@ fi
############################################################################# #############################################################################
# Determine the version of Tor. # Determine the version of Tor.
TOR_VERSION=$(grep -m 1 AC_INIT ${CI_SRCDIR}/configure.ac | sed -e 's/.*\[//; s/\].*//;') TOR_VERSION=$(grep -m 1 AC_INIT "${CI_SRCDIR}"/configure.ac | sed -e 's/.*\[//; s/\].*//;')
# Use variables like these when we need to behave differently depending on # Use variables like these when we need to behave differently depending on
# Tor version. Only create the variables we need. # Tor version. Only create the variables we need.