Merge branch 'maint-0.4.6'

Signed-off-by: David Goulet <dgoulet@torproject.org>

diff --cc doc/asciidoc-helper.sh
index fdaab05b8e0a4c933fc0bbc41d801cd99bf54fbc,3706ca2e142936d46453029e16a25a3dbb35b11e..98e216e68a3f999b73839b25b837a09169e9785b
--- 1/doc/asciidoc-helper.sh
--- 2/doc/asciidoc-helper.sh
+++ b/doc/asciidoc-helper.sh
@@@ -9,10 -9,11 +9,11 @@@
  set -e
  
  if [ $# != 3 ]; then
 -  exit 1;
 +    exit 1
  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
  
@@@ -21,16 -22,16 +22,16 @@@ if [ "$1" = "html" ]; the
      base=${output%%.html.in}
  
      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";
++        TZ=UTC "$2" -f "$(dirname "$0")/nofooter.conf" -d manpage -o "$output" "$input";
      else
 -      echo "==================================";
 -      echo;
 -      echo "You need asciidoc installed to be able to build the manpage.";
 -      echo "To build without manpages, use the --disable-asciidoc argument";
 -      echo "when calling configure.";
 -      echo;
 -      echo "==================================";
 -      exit 1;
 +        echo "=================================="
 +        echo
 +        echo "You need asciidoc installed to be able to build the manpage."
 +        echo "To build without manpages, use the --disable-asciidoc argument"
 +        echo "when calling configure."
 +        echo
 +        echo "=================================="
 +        exit 1
      fi
  elif [ "$1" = "man" ]; then
      input=${output%%.1.in}.1.txt

diff --cc scripts/ci/ci-driver.sh
Simple merge