date:20200812

[tor-commits] [tor/master] Make test_glob() pass even when run as root.

2020-08-12 Thread nickm

commit 7b4716a7624b73e60f70485ac577ef6cf884e67c
Author: Nick Mathewson 
Date:   Wed Aug 12 20:36:23 2020 -0400

Make test_glob() pass even when run as root.

Previously the test relied on not being able to look inside 000
directories, which is a thing root _can_ do.

Bug not in any released Tor version.
---
 src/test/test_util.c | 13 -
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/test/test_util.c b/src/test/test_util.c
index 230f2c7034..0e2550d5c5 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -4622,11 +4622,14 @@ test_util_glob(void *ptr)
   TEST("\\*");
   EXPECT_EMPTY();
 
-  // test forbidden directory
-  tor_asprintf(, "%s"PATH_SEPARATOR"*"PATH_SEPARATOR"*", dirname);
-  results = tor_glob(pattern);
-  tor_free(pattern);
-  tt_assert(!results);
+  if (getuid() != 0) {
+// test forbidden directory, if we're not root.
+// (Root will be able to see this directory anyway.)
+tor_asprintf(, "%s"PATH_SEPARATOR"*"PATH_SEPARATOR"*", dirname);
+results = tor_glob(pattern);
+tor_free(pattern);
+tt_assert(!results);
+  }
 #endif
 
 #undef TEST

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-08-12 Thread nickm

commit 34919368cebb1e635d10694d8ec42911db909130
Merge: 309eafbc3c 07f0210a05
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

2020-08-12 Thread nickm

commit feecf46e6deca4493c46b53e84872a76fff67b80
Merge: b6fb925e99 07f0210a05
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.4.2' into release-0.4.2

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-08-12 Thread nickm

commit 34919368cebb1e635d10694d8ec42911db909130
Merge: 309eafbc3c 07f0210a05
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4

2020-08-12 Thread nickm

commit 8bd79bd75e760e7493c2fc7dcf5b38d453ea9f13
Merge: a2e64b3e85 9d77ed7be2
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.4.4' into release-0.4.4

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] CI: Turn on stem with 044 and later.

2020-08-12 Thread nickm

commit 41a7ab96e578e58f277b34f5735d35a2a168da09
Author: Nick Mathewson 
Date:   Wed Aug 12 20:13:18 2020 -0400

CI: Turn on stem with 044 and later.
---
 .gitlab-ci.yml  |  7 +++
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ed615687b..c77e78764d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ variables:
 paths:
   - artifacts/
 
+# This template
 .apt-template:  |
   export LC_ALL=C.UTF-8
   echo Etc/UTC > /etc/timezone
@@ -90,9 +91,7 @@ debian-minimal:
 - ./scripts/ci/ci-driver.sh
 
 
-# TODO: This one just takes too long to finish right now!
-# Maybe we need to divide the call to ./src/test/test into a few segments,
-# that all end in similar amount of time?
+# TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
   <<: *debian-template
@@ -128,6 +127,6 @@ debian-integration:
   variables:
 CHECK: "no"
 CHUTNEY: "yes"
-# STEM: "yes" -- currently failing on <044.
+STEM: "yes"
   script:
 - ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 6faffd7b40..527bba82e5 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -267,18 +267,26 @@ TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 
's/.*\[//; s/\].*//;')
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 
 # These are the currently supported Tor versions; no need to work with anything
 # ancient in this script.
 case "$TOR_VERSION" in
 0.3.*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 ;;
 0.4.[012].*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
+;;
+0.4.3.*)
+TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=no
 ;;
 *)
 TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=yes
 ;;
 esac
 
@@ -427,21 +435,25 @@ fi
 
 if [[ "${STEM}" = "yes" ]]; then
start_section "Stem"
-   #  This shold probably be part some test-stem make target.
-   if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
- python3 "${STEM_PATH}/run_tests.py" \
- --tor src/app/tor \
- --integ --test control.controller \
- --test control.base_controller \
- --test process \
- --log TRACE \
- --log-file stem.log ; then
-   hooray "Stem tests have succeeded"
-   else
+   if [[ "${TOR_VER_AT_LEAST_044}" = 'yes' ]]; then
+ #  This shold probably be part some test-stem make target.
+ if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
+   python3 "${STEM_PATH}/run_tests.py" \
+   --tor src/app/tor \
+   --integ --test control.controller \
+   --test control.base_controller \
+   --test process \
+   --log TRACE \
+   --log-file stem.log ; then
+ hooray "Stem tests have succeeded"
+ else
error "Stem output:"
runcmd tail -1000 "${STEM_PATH}"/test/data/tor_log
runcmd grep -v "SocketClosed" stem.log | tail -1000
FAILED_TESTS="${FAILED_TESTS} stem"
+ fi
+   else
+   skipping "Stem: broken with <= 0.4.3. See bug tor#40077"
fi
end_section "Stem"
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Improve comments in .gitlab-ci.yml

2020-08-12 Thread nickm

commit aeafb7f44f07136101c06ea2986b295ef9915c9c
Author: Nick Mathewson 
Date:   Wed Aug 12 20:20:58 2020 -0400

Improve comments in .gitlab-ci.yml
---
 .gitlab-ci.yml | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c77e78764d..176c71f8f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,12 +58,18 @@ variables:
   <<: *artifacts-template
   variables:
 DEBIAN_FRONTEND: "noninteractive"
+  # TODO: Using "cache" in this way speeds up our downloads.  It would be
+  # even better, though, to start with a pre-upgraded debian image.
+  #
+  # TODO: Will we have to do this differently once we have more than one
+  # debian version that we're using?
   cache:
 key: apt
 paths:
   - apt-cache
   before_script:
 - *apt-template
+# Install patches unconditionally.
 - apt-get install
 automake
 build-essential
@@ -77,20 +83,28 @@ variables:
 pkg-config
 python3
 zlib1g-dev
+# Install patches that we only need for some use cases.
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
 - if [ "$STEM" = yes ]; then apt-get install timelimit; fi
 - if [ "$CC" = clang ]; then apt-get install clang; fi
+# TODO: This next line should not be debian-only.
 - if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+# TODO: This next line should not be debian-only.
 - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
+# Minmal check on debian: just make, make check.
+#
 debian-minimal:
   image: debian:stable
   <<: *debian-template
   script:
 - ./scripts/ci/ci-driver.sh
 
-
+#
+# Run "make check" with a hardened clang on debian stable.  This takes
+# care of a hardening check, and a compile-with-clang check.
+#
 # TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
@@ -101,6 +115,8 @@ debian-hardened:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Distcheck on debian stable
 debian-distcheck:
   image: debian:stable
   <<: *debian-template
@@ -110,6 +126,8 @@ debian-distcheck:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Documentation tests on debian stable: doxygen and asciidoc.
 debian-docs:
   image: debian:stable
   <<: *debian-template
@@ -121,6 +139,13 @@ debian-docs:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Integration tests on debian stable: chutney and stem.
+#
+# TODO: It would be cool if this target didn't have to re-build tor, and
+#   could instead re-use Tor from debian-minimal.  That can be done
+#   with the 'artifacts' mechanism, in theory, but it would be good to
+#   avoid having to have a system with hundreds of artifacts.
 debian-integration:
   image: debian:stable
   <<: *debian-template



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-08-12 Thread nickm

commit 9d77ed7be2da18bef3ab1258f277c527347a94a7
Merge: f98b1988ec 34919368ce
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.4.3' into maint-0.4.4

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3

2020-08-12 Thread nickm

commit 146e4cfa95c3d0cd26f0804e186b2d445a3f771c
Merge: f94ad3d32a 34919368ce
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.4.3' into release-0.4.3

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-08-12 Thread nickm

commit 07f0210a0525423f8cbbb41d00df0aa2d40fedf5
Merge: 02bb719a94 aeafb7f44f
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2020-08-12 Thread nickm

commit d605622aded18c2d0c78f81c3c75735d4cf982ff
Merge: ac5a06d42c aeafb7f44f
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.3] Improve comments in .gitlab-ci.yml

2020-08-12 Thread nickm

commit aeafb7f44f07136101c06ea2986b295ef9915c9c
Author: Nick Mathewson 
Date:   Wed Aug 12 20:20:58 2020 -0400

Improve comments in .gitlab-ci.yml
---
 .gitlab-ci.yml | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c77e78764d..176c71f8f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,12 +58,18 @@ variables:
   <<: *artifacts-template
   variables:
 DEBIAN_FRONTEND: "noninteractive"
+  # TODO: Using "cache" in this way speeds up our downloads.  It would be
+  # even better, though, to start with a pre-upgraded debian image.
+  #
+  # TODO: Will we have to do this differently once we have more than one
+  # debian version that we're using?
   cache:
 key: apt
 paths:
   - apt-cache
   before_script:
 - *apt-template
+# Install patches unconditionally.
 - apt-get install
 automake
 build-essential
@@ -77,20 +83,28 @@ variables:
 pkg-config
 python3
 zlib1g-dev
+# Install patches that we only need for some use cases.
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
 - if [ "$STEM" = yes ]; then apt-get install timelimit; fi
 - if [ "$CC" = clang ]; then apt-get install clang; fi
+# TODO: This next line should not be debian-only.
 - if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+# TODO: This next line should not be debian-only.
 - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
+# Minmal check on debian: just make, make check.
+#
 debian-minimal:
   image: debian:stable
   <<: *debian-template
   script:
 - ./scripts/ci/ci-driver.sh
 
-
+#
+# Run "make check" with a hardened clang on debian stable.  This takes
+# care of a hardening check, and a compile-with-clang check.
+#
 # TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
@@ -101,6 +115,8 @@ debian-hardened:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Distcheck on debian stable
 debian-distcheck:
   image: debian:stable
   <<: *debian-template
@@ -110,6 +126,8 @@ debian-distcheck:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Documentation tests on debian stable: doxygen and asciidoc.
 debian-docs:
   image: debian:stable
   <<: *debian-template
@@ -121,6 +139,13 @@ debian-docs:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Integration tests on debian stable: chutney and stem.
+#
+# TODO: It would be cool if this target didn't have to re-build tor, and
+#   could instead re-use Tor from debian-minimal.  That can be done
+#   with the 'artifacts' mechanism, in theory, but it would be good to
+#   avoid having to have a system with hundreds of artifacts.
 debian-integration:
   image: debian:stable
   <<: *debian-template



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Improve comments in .gitlab-ci.yml

2020-08-12 Thread nickm

commit aeafb7f44f07136101c06ea2986b295ef9915c9c
Author: Nick Mathewson 
Date:   Wed Aug 12 20:20:58 2020 -0400

Improve comments in .gitlab-ci.yml
---
 .gitlab-ci.yml | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c77e78764d..176c71f8f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,12 +58,18 @@ variables:
   <<: *artifacts-template
   variables:
 DEBIAN_FRONTEND: "noninteractive"
+  # TODO: Using "cache" in this way speeds up our downloads.  It would be
+  # even better, though, to start with a pre-upgraded debian image.
+  #
+  # TODO: Will we have to do this differently once we have more than one
+  # debian version that we're using?
   cache:
 key: apt
 paths:
   - apt-cache
   before_script:
 - *apt-template
+# Install patches unconditionally.
 - apt-get install
 automake
 build-essential
@@ -77,20 +83,28 @@ variables:
 pkg-config
 python3
 zlib1g-dev
+# Install patches that we only need for some use cases.
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
 - if [ "$STEM" = yes ]; then apt-get install timelimit; fi
 - if [ "$CC" = clang ]; then apt-get install clang; fi
+# TODO: This next line should not be debian-only.
 - if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+# TODO: This next line should not be debian-only.
 - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
+# Minmal check on debian: just make, make check.
+#
 debian-minimal:
   image: debian:stable
   <<: *debian-template
   script:
 - ./scripts/ci/ci-driver.sh
 
-
+#
+# Run "make check" with a hardened clang on debian stable.  This takes
+# care of a hardening check, and a compile-with-clang check.
+#
 # TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
@@ -101,6 +115,8 @@ debian-hardened:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Distcheck on debian stable
 debian-distcheck:
   image: debian:stable
   <<: *debian-template
@@ -110,6 +126,8 @@ debian-distcheck:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Documentation tests on debian stable: doxygen and asciidoc.
 debian-docs:
   image: debian:stable
   <<: *debian-template
@@ -121,6 +139,13 @@ debian-docs:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Integration tests on debian stable: chutney and stem.
+#
+# TODO: It would be cool if this target didn't have to re-build tor, and
+#   could instead re-use Tor from debian-minimal.  That can be done
+#   with the 'artifacts' mechanism, in theory, but it would be good to
+#   avoid having to have a system with hundreds of artifacts.
 debian-integration:
   image: debian:stable
   <<: *debian-template



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-08-12 Thread nickm

commit 34919368cebb1e635d10694d8ec42911db909130
Merge: 309eafbc3c 07f0210a05
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.2] Improve comments in .gitlab-ci.yml

2020-08-12 Thread nickm

commit aeafb7f44f07136101c06ea2986b295ef9915c9c
Author: Nick Mathewson 
Date:   Wed Aug 12 20:20:58 2020 -0400

Improve comments in .gitlab-ci.yml
---
 .gitlab-ci.yml | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c77e78764d..176c71f8f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,12 +58,18 @@ variables:
   <<: *artifacts-template
   variables:
 DEBIAN_FRONTEND: "noninteractive"
+  # TODO: Using "cache" in this way speeds up our downloads.  It would be
+  # even better, though, to start with a pre-upgraded debian image.
+  #
+  # TODO: Will we have to do this differently once we have more than one
+  # debian version that we're using?
   cache:
 key: apt
 paths:
   - apt-cache
   before_script:
 - *apt-template
+# Install patches unconditionally.
 - apt-get install
 automake
 build-essential
@@ -77,20 +83,28 @@ variables:
 pkg-config
 python3
 zlib1g-dev
+# Install patches that we only need for some use cases.
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
 - if [ "$STEM" = yes ]; then apt-get install timelimit; fi
 - if [ "$CC" = clang ]; then apt-get install clang; fi
+# TODO: This next line should not be debian-only.
 - if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+# TODO: This next line should not be debian-only.
 - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
+# Minmal check on debian: just make, make check.
+#
 debian-minimal:
   image: debian:stable
   <<: *debian-template
   script:
 - ./scripts/ci/ci-driver.sh
 
-
+#
+# Run "make check" with a hardened clang on debian stable.  This takes
+# care of a hardening check, and a compile-with-clang check.
+#
 # TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
@@ -101,6 +115,8 @@ debian-hardened:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Distcheck on debian stable
 debian-distcheck:
   image: debian:stable
   <<: *debian-template
@@ -110,6 +126,8 @@ debian-distcheck:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Documentation tests on debian stable: doxygen and asciidoc.
 debian-docs:
   image: debian:stable
   <<: *debian-template
@@ -121,6 +139,13 @@ debian-docs:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Integration tests on debian stable: chutney and stem.
+#
+# TODO: It would be cool if this target didn't have to re-build tor, and
+#   could instead re-use Tor from debian-minimal.  That can be done
+#   with the 'artifacts' mechanism, in theory, but it would be good to
+#   avoid having to have a system with hundreds of artifacts.
 debian-integration:
   image: debian:stable
   <<: *debian-template



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.5] CI: Turn on stem with 044 and later.

2020-08-12 Thread nickm

commit 41a7ab96e578e58f277b34f5735d35a2a168da09
Author: Nick Mathewson 
Date:   Wed Aug 12 20:13:18 2020 -0400

CI: Turn on stem with 044 and later.
---
 .gitlab-ci.yml  |  7 +++
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ed615687b..c77e78764d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ variables:
 paths:
   - artifacts/
 
+# This template
 .apt-template:  |
   export LC_ALL=C.UTF-8
   echo Etc/UTC > /etc/timezone
@@ -90,9 +91,7 @@ debian-minimal:
 - ./scripts/ci/ci-driver.sh
 
 
-# TODO: This one just takes too long to finish right now!
-# Maybe we need to divide the call to ./src/test/test into a few segments,
-# that all end in similar amount of time?
+# TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
   <<: *debian-template
@@ -128,6 +127,6 @@ debian-integration:
   variables:
 CHECK: "no"
 CHUTNEY: "yes"
-# STEM: "yes" -- currently failing on <044.
+STEM: "yes"
   script:
 - ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 6faffd7b40..527bba82e5 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -267,18 +267,26 @@ TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 
's/.*\[//; s/\].*//;')
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 
 # These are the currently supported Tor versions; no need to work with anything
 # ancient in this script.
 case "$TOR_VERSION" in
 0.3.*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 ;;
 0.4.[012].*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
+;;
+0.4.3.*)
+TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=no
 ;;
 *)
 TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=yes
 ;;
 esac
 
@@ -427,21 +435,25 @@ fi
 
 if [[ "${STEM}" = "yes" ]]; then
start_section "Stem"
-   #  This shold probably be part some test-stem make target.
-   if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
- python3 "${STEM_PATH}/run_tests.py" \
- --tor src/app/tor \
- --integ --test control.controller \
- --test control.base_controller \
- --test process \
- --log TRACE \
- --log-file stem.log ; then
-   hooray "Stem tests have succeeded"
-   else
+   if [[ "${TOR_VER_AT_LEAST_044}" = 'yes' ]]; then
+ #  This shold probably be part some test-stem make target.
+ if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
+   python3 "${STEM_PATH}/run_tests.py" \
+   --tor src/app/tor \
+   --integ --test control.controller \
+   --test control.base_controller \
+   --test process \
+   --log TRACE \
+   --log-file stem.log ; then
+ hooray "Stem tests have succeeded"
+ else
error "Stem output:"
runcmd tail -1000 "${STEM_PATH}"/test/data/tor_log
runcmd grep -v "SocketClosed" stem.log | tail -1000
FAILED_TESTS="${FAILED_TESTS} stem"
+ fi
+   else
+   skipping "Stem: broken with <= 0.4.3. See bug tor#40077"
fi
end_section "Stem"
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.4.4'

2020-08-12 Thread nickm

commit effc9739bfb3c91171be47673c67ec2bd05c2758
Merge: 9ef991dbe3 9d77ed7be2
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.4.4'

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-08-12 Thread nickm

commit 07f0210a0525423f8cbbb41d00df0aa2d40fedf5
Merge: 02bb719a94 aeafb7f44f
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.3] CI: Turn on stem with 044 and later.

2020-08-12 Thread nickm

commit 41a7ab96e578e58f277b34f5735d35a2a168da09
Author: Nick Mathewson 
Date:   Wed Aug 12 20:13:18 2020 -0400

CI: Turn on stem with 044 and later.
---
 .gitlab-ci.yml  |  7 +++
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ed615687b..c77e78764d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ variables:
 paths:
   - artifacts/
 
+# This template
 .apt-template:  |
   export LC_ALL=C.UTF-8
   echo Etc/UTC > /etc/timezone
@@ -90,9 +91,7 @@ debian-minimal:
 - ./scripts/ci/ci-driver.sh
 
 
-# TODO: This one just takes too long to finish right now!
-# Maybe we need to divide the call to ./src/test/test into a few segments,
-# that all end in similar amount of time?
+# TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
   <<: *debian-template
@@ -128,6 +127,6 @@ debian-integration:
   variables:
 CHECK: "no"
 CHUTNEY: "yes"
-# STEM: "yes" -- currently failing on <044.
+STEM: "yes"
   script:
 - ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 6faffd7b40..527bba82e5 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -267,18 +267,26 @@ TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 
's/.*\[//; s/\].*//;')
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 
 # These are the currently supported Tor versions; no need to work with anything
 # ancient in this script.
 case "$TOR_VERSION" in
 0.3.*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 ;;
 0.4.[012].*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
+;;
+0.4.3.*)
+TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=no
 ;;
 *)
 TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=yes
 ;;
 esac
 
@@ -427,21 +435,25 @@ fi
 
 if [[ "${STEM}" = "yes" ]]; then
start_section "Stem"
-   #  This shold probably be part some test-stem make target.
-   if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
- python3 "${STEM_PATH}/run_tests.py" \
- --tor src/app/tor \
- --integ --test control.controller \
- --test control.base_controller \
- --test process \
- --log TRACE \
- --log-file stem.log ; then
-   hooray "Stem tests have succeeded"
-   else
+   if [[ "${TOR_VER_AT_LEAST_044}" = 'yes' ]]; then
+ #  This shold probably be part some test-stem make target.
+ if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
+   python3 "${STEM_PATH}/run_tests.py" \
+   --tor src/app/tor \
+   --integ --test control.controller \
+   --test control.base_controller \
+   --test process \
+   --log TRACE \
+   --log-file stem.log ; then
+ hooray "Stem tests have succeeded"
+ else
error "Stem output:"
runcmd tail -1000 "${STEM_PATH}"/test/data/tor_log
runcmd grep -v "SocketClosed" stem.log | tail -1000
FAILED_TESTS="${FAILED_TESTS} stem"
+ fi
+   else
+   skipping "Stem: broken with <= 0.4.3. See bug tor#40077"
fi
end_section "Stem"
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.3] CI: Turn on stem with 044 and later.

2020-08-12 Thread nickm

commit 41a7ab96e578e58f277b34f5735d35a2a168da09
Author: Nick Mathewson 
Date:   Wed Aug 12 20:13:18 2020 -0400

CI: Turn on stem with 044 and later.
---
 .gitlab-ci.yml  |  7 +++
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ed615687b..c77e78764d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ variables:
 paths:
   - artifacts/
 
+# This template
 .apt-template:  |
   export LC_ALL=C.UTF-8
   echo Etc/UTC > /etc/timezone
@@ -90,9 +91,7 @@ debian-minimal:
 - ./scripts/ci/ci-driver.sh
 
 
-# TODO: This one just takes too long to finish right now!
-# Maybe we need to divide the call to ./src/test/test into a few segments,
-# that all end in similar amount of time?
+# TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
   <<: *debian-template
@@ -128,6 +127,6 @@ debian-integration:
   variables:
 CHECK: "no"
 CHUTNEY: "yes"
-# STEM: "yes" -- currently failing on <044.
+STEM: "yes"
   script:
 - ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 6faffd7b40..527bba82e5 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -267,18 +267,26 @@ TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 
's/.*\[//; s/\].*//;')
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 
 # These are the currently supported Tor versions; no need to work with anything
 # ancient in this script.
 case "$TOR_VERSION" in
 0.3.*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 ;;
 0.4.[012].*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
+;;
+0.4.3.*)
+TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=no
 ;;
 *)
 TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=yes
 ;;
 esac
 
@@ -427,21 +435,25 @@ fi
 
 if [[ "${STEM}" = "yes" ]]; then
start_section "Stem"
-   #  This shold probably be part some test-stem make target.
-   if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
- python3 "${STEM_PATH}/run_tests.py" \
- --tor src/app/tor \
- --integ --test control.controller \
- --test control.base_controller \
- --test process \
- --log TRACE \
- --log-file stem.log ; then
-   hooray "Stem tests have succeeded"
-   else
+   if [[ "${TOR_VER_AT_LEAST_044}" = 'yes' ]]; then
+ #  This shold probably be part some test-stem make target.
+ if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
+   python3 "${STEM_PATH}/run_tests.py" \
+   --tor src/app/tor \
+   --integ --test control.controller \
+   --test control.base_controller \
+   --test process \
+   --log TRACE \
+   --log-file stem.log ; then
+ hooray "Stem tests have succeeded"
+ else
error "Stem output:"
runcmd tail -1000 "${STEM_PATH}"/test/data/tor_log
runcmd grep -v "SocketClosed" stem.log | tail -1000
FAILED_TESTS="${FAILED_TESTS} stem"
+ fi
+   else
+   skipping "Stem: broken with <= 0.4.3. See bug tor#40077"
fi
end_section "Stem"
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-08-12 Thread nickm

commit 07f0210a0525423f8cbbb41d00df0aa2d40fedf5
Merge: 02bb719a94 aeafb7f44f
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-08-12 Thread nickm

commit 07f0210a0525423f8cbbb41d00df0aa2d40fedf5
Merge: 02bb719a94 aeafb7f44f
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-08-12 Thread nickm

commit 07f0210a0525423f8cbbb41d00df0aa2d40fedf5
Merge: 02bb719a94 aeafb7f44f
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-08-12 Thread nickm

commit 9d77ed7be2da18bef3ab1258f277c527347a94a7
Merge: f98b1988ec 34919368ce
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.4.3' into maint-0.4.4

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-08-12 Thread nickm

commit 07f0210a0525423f8cbbb41d00df0aa2d40fedf5
Merge: 02bb719a94 aeafb7f44f
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.2] CI: Turn on stem with 044 and later.

2020-08-12 Thread nickm

commit 41a7ab96e578e58f277b34f5735d35a2a168da09
Author: Nick Mathewson 
Date:   Wed Aug 12 20:13:18 2020 -0400

CI: Turn on stem with 044 and later.
---
 .gitlab-ci.yml  |  7 +++
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ed615687b..c77e78764d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ variables:
 paths:
   - artifacts/
 
+# This template
 .apt-template:  |
   export LC_ALL=C.UTF-8
   echo Etc/UTC > /etc/timezone
@@ -90,9 +91,7 @@ debian-minimal:
 - ./scripts/ci/ci-driver.sh
 
 
-# TODO: This one just takes too long to finish right now!
-# Maybe we need to divide the call to ./src/test/test into a few segments,
-# that all end in similar amount of time?
+# TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
   <<: *debian-template
@@ -128,6 +127,6 @@ debian-integration:
   variables:
 CHECK: "no"
 CHUTNEY: "yes"
-# STEM: "yes" -- currently failing on <044.
+STEM: "yes"
   script:
 - ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 6faffd7b40..527bba82e5 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -267,18 +267,26 @@ TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 
's/.*\[//; s/\].*//;')
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 
 # These are the currently supported Tor versions; no need to work with anything
 # ancient in this script.
 case "$TOR_VERSION" in
 0.3.*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 ;;
 0.4.[012].*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
+;;
+0.4.3.*)
+TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=no
 ;;
 *)
 TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=yes
 ;;
 esac
 
@@ -427,21 +435,25 @@ fi
 
 if [[ "${STEM}" = "yes" ]]; then
start_section "Stem"
-   #  This shold probably be part some test-stem make target.
-   if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
- python3 "${STEM_PATH}/run_tests.py" \
- --tor src/app/tor \
- --integ --test control.controller \
- --test control.base_controller \
- --test process \
- --log TRACE \
- --log-file stem.log ; then
-   hooray "Stem tests have succeeded"
-   else
+   if [[ "${TOR_VER_AT_LEAST_044}" = 'yes' ]]; then
+ #  This shold probably be part some test-stem make target.
+ if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
+   python3 "${STEM_PATH}/run_tests.py" \
+   --tor src/app/tor \
+   --integ --test control.controller \
+   --test control.base_controller \
+   --test process \
+   --log TRACE \
+   --log-file stem.log ; then
+ hooray "Stem tests have succeeded"
+ else
error "Stem output:"
runcmd tail -1000 "${STEM_PATH}"/test/data/tor_log
runcmd grep -v "SocketClosed" stem.log | tail -1000
FAILED_TESTS="${FAILED_TESTS} stem"
+ fi
+   else
+   skipping "Stem: broken with <= 0.4.3. See bug tor#40077"
fi
end_section "Stem"
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.2] CI: Turn on stem with 044 and later.

2020-08-12 Thread nickm

commit 41a7ab96e578e58f277b34f5735d35a2a168da09
Author: Nick Mathewson 
Date:   Wed Aug 12 20:13:18 2020 -0400

CI: Turn on stem with 044 and later.
---
 .gitlab-ci.yml  |  7 +++
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ed615687b..c77e78764d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ variables:
 paths:
   - artifacts/
 
+# This template
 .apt-template:  |
   export LC_ALL=C.UTF-8
   echo Etc/UTC > /etc/timezone
@@ -90,9 +91,7 @@ debian-minimal:
 - ./scripts/ci/ci-driver.sh
 
 
-# TODO: This one just takes too long to finish right now!
-# Maybe we need to divide the call to ./src/test/test into a few segments,
-# that all end in similar amount of time?
+# TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
   <<: *debian-template
@@ -128,6 +127,6 @@ debian-integration:
   variables:
 CHECK: "no"
 CHUTNEY: "yes"
-# STEM: "yes" -- currently failing on <044.
+STEM: "yes"
   script:
 - ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 6faffd7b40..527bba82e5 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -267,18 +267,26 @@ TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 
's/.*\[//; s/\].*//;')
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 
 # These are the currently supported Tor versions; no need to work with anything
 # ancient in this script.
 case "$TOR_VERSION" in
 0.3.*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 ;;
 0.4.[012].*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
+;;
+0.4.3.*)
+TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=no
 ;;
 *)
 TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=yes
 ;;
 esac
 
@@ -427,21 +435,25 @@ fi
 
 if [[ "${STEM}" = "yes" ]]; then
start_section "Stem"
-   #  This shold probably be part some test-stem make target.
-   if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
- python3 "${STEM_PATH}/run_tests.py" \
- --tor src/app/tor \
- --integ --test control.controller \
- --test control.base_controller \
- --test process \
- --log TRACE \
- --log-file stem.log ; then
-   hooray "Stem tests have succeeded"
-   else
+   if [[ "${TOR_VER_AT_LEAST_044}" = 'yes' ]]; then
+ #  This shold probably be part some test-stem make target.
+ if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
+   python3 "${STEM_PATH}/run_tests.py" \
+   --tor src/app/tor \
+   --integ --test control.controller \
+   --test control.base_controller \
+   --test process \
+   --log TRACE \
+   --log-file stem.log ; then
+ hooray "Stem tests have succeeded"
+ else
error "Stem output:"
runcmd tail -1000 "${STEM_PATH}"/test/data/tor_log
runcmd grep -v "SocketClosed" stem.log | tail -1000
FAILED_TESTS="${FAILED_TESTS} stem"
+ fi
+   else
+   skipping "Stem: broken with <= 0.4.3. See bug tor#40077"
fi
end_section "Stem"
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-08-12 Thread nickm

commit 9d77ed7be2da18bef3ab1258f277c527347a94a7
Merge: f98b1988ec 34919368ce
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.4.3' into maint-0.4.4

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] CI: Turn on stem with 044 and later.

2020-08-12 Thread nickm

commit 41a7ab96e578e58f277b34f5735d35a2a168da09
Author: Nick Mathewson 
Date:   Wed Aug 12 20:13:18 2020 -0400

CI: Turn on stem with 044 and later.
---
 .gitlab-ci.yml  |  7 +++
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ed615687b..c77e78764d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ variables:
 paths:
   - artifacts/
 
+# This template
 .apt-template:  |
   export LC_ALL=C.UTF-8
   echo Etc/UTC > /etc/timezone
@@ -90,9 +91,7 @@ debian-minimal:
 - ./scripts/ci/ci-driver.sh
 
 
-# TODO: This one just takes too long to finish right now!
-# Maybe we need to divide the call to ./src/test/test into a few segments,
-# that all end in similar amount of time?
+# TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
   <<: *debian-template
@@ -128,6 +127,6 @@ debian-integration:
   variables:
 CHECK: "no"
 CHUTNEY: "yes"
-# STEM: "yes" -- currently failing on <044.
+STEM: "yes"
   script:
 - ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 6faffd7b40..527bba82e5 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -267,18 +267,26 @@ TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 
's/.*\[//; s/\].*//;')
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 
 # These are the currently supported Tor versions; no need to work with anything
 # ancient in this script.
 case "$TOR_VERSION" in
 0.3.*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 ;;
 0.4.[012].*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
+;;
+0.4.3.*)
+TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=no
 ;;
 *)
 TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=yes
 ;;
 esac
 
@@ -427,21 +435,25 @@ fi
 
 if [[ "${STEM}" = "yes" ]]; then
start_section "Stem"
-   #  This shold probably be part some test-stem make target.
-   if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
- python3 "${STEM_PATH}/run_tests.py" \
- --tor src/app/tor \
- --integ --test control.controller \
- --test control.base_controller \
- --test process \
- --log TRACE \
- --log-file stem.log ; then
-   hooray "Stem tests have succeeded"
-   else
+   if [[ "${TOR_VER_AT_LEAST_044}" = 'yes' ]]; then
+ #  This shold probably be part some test-stem make target.
+ if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
+   python3 "${STEM_PATH}/run_tests.py" \
+   --tor src/app/tor \
+   --integ --test control.controller \
+   --test control.base_controller \
+   --test process \
+   --log TRACE \
+   --log-file stem.log ; then
+ hooray "Stem tests have succeeded"
+ else
error "Stem output:"
runcmd tail -1000 "${STEM_PATH}"/test/data/tor_log
runcmd grep -v "SocketClosed" stem.log | tail -1000
FAILED_TESTS="${FAILED_TESTS} stem"
+ fi
+   else
+   skipping "Stem: broken with <= 0.4.3. See bug tor#40077"
fi
end_section "Stem"
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.2] Improve comments in .gitlab-ci.yml

2020-08-12 Thread nickm

commit aeafb7f44f07136101c06ea2986b295ef9915c9c
Author: Nick Mathewson 
Date:   Wed Aug 12 20:20:58 2020 -0400

Improve comments in .gitlab-ci.yml
---
 .gitlab-ci.yml | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c77e78764d..176c71f8f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,12 +58,18 @@ variables:
   <<: *artifacts-template
   variables:
 DEBIAN_FRONTEND: "noninteractive"
+  # TODO: Using "cache" in this way speeds up our downloads.  It would be
+  # even better, though, to start with a pre-upgraded debian image.
+  #
+  # TODO: Will we have to do this differently once we have more than one
+  # debian version that we're using?
   cache:
 key: apt
 paths:
   - apt-cache
   before_script:
 - *apt-template
+# Install patches unconditionally.
 - apt-get install
 automake
 build-essential
@@ -77,20 +83,28 @@ variables:
 pkg-config
 python3
 zlib1g-dev
+# Install patches that we only need for some use cases.
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
 - if [ "$STEM" = yes ]; then apt-get install timelimit; fi
 - if [ "$CC" = clang ]; then apt-get install clang; fi
+# TODO: This next line should not be debian-only.
 - if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+# TODO: This next line should not be debian-only.
 - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
+# Minmal check on debian: just make, make check.
+#
 debian-minimal:
   image: debian:stable
   <<: *debian-template
   script:
 - ./scripts/ci/ci-driver.sh
 
-
+#
+# Run "make check" with a hardened clang on debian stable.  This takes
+# care of a hardening check, and a compile-with-clang check.
+#
 # TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
@@ -101,6 +115,8 @@ debian-hardened:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Distcheck on debian stable
 debian-distcheck:
   image: debian:stable
   <<: *debian-template
@@ -110,6 +126,8 @@ debian-distcheck:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Documentation tests on debian stable: doxygen and asciidoc.
 debian-docs:
   image: debian:stable
   <<: *debian-template
@@ -121,6 +139,13 @@ debian-docs:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Integration tests on debian stable: chutney and stem.
+#
+# TODO: It would be cool if this target didn't have to re-build tor, and
+#   could instead re-use Tor from debian-minimal.  That can be done
+#   with the 'artifacts' mechanism, in theory, but it would be good to
+#   avoid having to have a system with hundreds of artifacts.
 debian-integration:
   image: debian:stable
   <<: *debian-template



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-08-12 Thread nickm

commit 07f0210a0525423f8cbbb41d00df0aa2d40fedf5
Merge: 02bb719a94 aeafb7f44f
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-08-12 Thread nickm

commit 34919368cebb1e635d10694d8ec42911db909130
Merge: 309eafbc3c 07f0210a05
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-08-12 Thread nickm

commit 34919368cebb1e635d10694d8ec42911db909130
Merge: 309eafbc3c 07f0210a05
Author: Nick Mathewson 
Date:   Wed Aug 12 20:21:04 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 52 insertions(+), 16 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.4] Improve comments in .gitlab-ci.yml

2020-08-12 Thread nickm

commit aeafb7f44f07136101c06ea2986b295ef9915c9c
Author: Nick Mathewson 
Date:   Wed Aug 12 20:20:58 2020 -0400

Improve comments in .gitlab-ci.yml
---
 .gitlab-ci.yml | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c77e78764d..176c71f8f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,12 +58,18 @@ variables:
   <<: *artifacts-template
   variables:
 DEBIAN_FRONTEND: "noninteractive"
+  # TODO: Using "cache" in this way speeds up our downloads.  It would be
+  # even better, though, to start with a pre-upgraded debian image.
+  #
+  # TODO: Will we have to do this differently once we have more than one
+  # debian version that we're using?
   cache:
 key: apt
 paths:
   - apt-cache
   before_script:
 - *apt-template
+# Install patches unconditionally.
 - apt-get install
 automake
 build-essential
@@ -77,20 +83,28 @@ variables:
 pkg-config
 python3
 zlib1g-dev
+# Install patches that we only need for some use cases.
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
 - if [ "$STEM" = yes ]; then apt-get install timelimit; fi
 - if [ "$CC" = clang ]; then apt-get install clang; fi
+# TODO: This next line should not be debian-only.
 - if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+# TODO: This next line should not be debian-only.
 - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
+# Minmal check on debian: just make, make check.
+#
 debian-minimal:
   image: debian:stable
   <<: *debian-template
   script:
 - ./scripts/ci/ci-driver.sh
 
-
+#
+# Run "make check" with a hardened clang on debian stable.  This takes
+# care of a hardening check, and a compile-with-clang check.
+#
 # TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
@@ -101,6 +115,8 @@ debian-hardened:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Distcheck on debian stable
 debian-distcheck:
   image: debian:stable
   <<: *debian-template
@@ -110,6 +126,8 @@ debian-distcheck:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Documentation tests on debian stable: doxygen and asciidoc.
 debian-docs:
   image: debian:stable
   <<: *debian-template
@@ -121,6 +139,13 @@ debian-docs:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Integration tests on debian stable: chutney and stem.
+#
+# TODO: It would be cool if this target didn't have to re-build tor, and
+#   could instead re-use Tor from debian-minimal.  That can be done
+#   with the 'artifacts' mechanism, in theory, but it would be good to
+#   avoid having to have a system with hundreds of artifacts.
 debian-integration:
   image: debian:stable
   <<: *debian-template



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.5] Improve comments in .gitlab-ci.yml

2020-08-12 Thread nickm

commit aeafb7f44f07136101c06ea2986b295ef9915c9c
Author: Nick Mathewson 
Date:   Wed Aug 12 20:20:58 2020 -0400

Improve comments in .gitlab-ci.yml
---
 .gitlab-ci.yml | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c77e78764d..176c71f8f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,12 +58,18 @@ variables:
   <<: *artifacts-template
   variables:
 DEBIAN_FRONTEND: "noninteractive"
+  # TODO: Using "cache" in this way speeds up our downloads.  It would be
+  # even better, though, to start with a pre-upgraded debian image.
+  #
+  # TODO: Will we have to do this differently once we have more than one
+  # debian version that we're using?
   cache:
 key: apt
 paths:
   - apt-cache
   before_script:
 - *apt-template
+# Install patches unconditionally.
 - apt-get install
 automake
 build-essential
@@ -77,20 +83,28 @@ variables:
 pkg-config
 python3
 zlib1g-dev
+# Install patches that we only need for some use cases.
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
 - if [ "$STEM" = yes ]; then apt-get install timelimit; fi
 - if [ "$CC" = clang ]; then apt-get install clang; fi
+# TODO: This next line should not be debian-only.
 - if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+# TODO: This next line should not be debian-only.
 - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
+# Minmal check on debian: just make, make check.
+#
 debian-minimal:
   image: debian:stable
   <<: *debian-template
   script:
 - ./scripts/ci/ci-driver.sh
 
-
+#
+# Run "make check" with a hardened clang on debian stable.  This takes
+# care of a hardening check, and a compile-with-clang check.
+#
 # TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
@@ -101,6 +115,8 @@ debian-hardened:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Distcheck on debian stable
 debian-distcheck:
   image: debian:stable
   <<: *debian-template
@@ -110,6 +126,8 @@ debian-distcheck:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Documentation tests on debian stable: doxygen and asciidoc.
 debian-docs:
   image: debian:stable
   <<: *debian-template
@@ -121,6 +139,13 @@ debian-docs:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Integration tests on debian stable: chutney and stem.
+#
+# TODO: It would be cool if this target didn't have to re-build tor, and
+#   could instead re-use Tor from debian-minimal.  That can be done
+#   with the 'artifacts' mechanism, in theory, but it would be good to
+#   avoid having to have a system with hundreds of artifacts.
 debian-integration:
   image: debian:stable
   <<: *debian-template

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Improve comments in .gitlab-ci.yml

2020-08-12 Thread nickm

commit aeafb7f44f07136101c06ea2986b295ef9915c9c
Author: Nick Mathewson 
Date:   Wed Aug 12 20:20:58 2020 -0400

Improve comments in .gitlab-ci.yml
---
 .gitlab-ci.yml | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c77e78764d..176c71f8f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,12 +58,18 @@ variables:
   <<: *artifacts-template
   variables:
 DEBIAN_FRONTEND: "noninteractive"
+  # TODO: Using "cache" in this way speeds up our downloads.  It would be
+  # even better, though, to start with a pre-upgraded debian image.
+  #
+  # TODO: Will we have to do this differently once we have more than one
+  # debian version that we're using?
   cache:
 key: apt
 paths:
   - apt-cache
   before_script:
 - *apt-template
+# Install patches unconditionally.
 - apt-get install
 automake
 build-essential
@@ -77,20 +83,28 @@ variables:
 pkg-config
 python3
 zlib1g-dev
+# Install patches that we only need for some use cases.
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
 - if [ "$STEM" = yes ]; then apt-get install timelimit; fi
 - if [ "$CC" = clang ]; then apt-get install clang; fi
+# TODO: This next line should not be debian-only.
 - if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+# TODO: This next line should not be debian-only.
 - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
+# Minmal check on debian: just make, make check.
+#
 debian-minimal:
   image: debian:stable
   <<: *debian-template
   script:
 - ./scripts/ci/ci-driver.sh
 
-
+#
+# Run "make check" with a hardened clang on debian stable.  This takes
+# care of a hardening check, and a compile-with-clang check.
+#
 # TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
@@ -101,6 +115,8 @@ debian-hardened:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Distcheck on debian stable
 debian-distcheck:
   image: debian:stable
   <<: *debian-template
@@ -110,6 +126,8 @@ debian-distcheck:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Documentation tests on debian stable: doxygen and asciidoc.
 debian-docs:
   image: debian:stable
   <<: *debian-template
@@ -121,6 +139,13 @@ debian-docs:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Integration tests on debian stable: chutney and stem.
+#
+# TODO: It would be cool if this target didn't have to re-build tor, and
+#   could instead re-use Tor from debian-minimal.  That can be done
+#   with the 'artifacts' mechanism, in theory, but it would be good to
+#   avoid having to have a system with hundreds of artifacts.
 debian-integration:
   image: debian:stable
   <<: *debian-template



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.4] CI: Turn on stem with 044 and later.

2020-08-12 Thread nickm

commit 41a7ab96e578e58f277b34f5735d35a2a168da09
Author: Nick Mathewson 
Date:   Wed Aug 12 20:13:18 2020 -0400

CI: Turn on stem with 044 and later.
---
 .gitlab-ci.yml  |  7 +++
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ed615687b..c77e78764d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ variables:
 paths:
   - artifacts/
 
+# This template
 .apt-template:  |
   export LC_ALL=C.UTF-8
   echo Etc/UTC > /etc/timezone
@@ -90,9 +91,7 @@ debian-minimal:
 - ./scripts/ci/ci-driver.sh
 
 
-# TODO: This one just takes too long to finish right now!
-# Maybe we need to divide the call to ./src/test/test into a few segments,
-# that all end in similar amount of time?
+# TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
   <<: *debian-template
@@ -128,6 +127,6 @@ debian-integration:
   variables:
 CHECK: "no"
 CHUTNEY: "yes"
-# STEM: "yes" -- currently failing on <044.
+STEM: "yes"
   script:
 - ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 6faffd7b40..527bba82e5 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -267,18 +267,26 @@ TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 
's/.*\[//; s/\].*//;')
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 
 # These are the currently supported Tor versions; no need to work with anything
 # ancient in this script.
 case "$TOR_VERSION" in
 0.3.*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 ;;
 0.4.[012].*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
+;;
+0.4.3.*)
+TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=no
 ;;
 *)
 TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=yes
 ;;
 esac
 
@@ -427,21 +435,25 @@ fi
 
 if [[ "${STEM}" = "yes" ]]; then
start_section "Stem"
-   #  This shold probably be part some test-stem make target.
-   if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
- python3 "${STEM_PATH}/run_tests.py" \
- --tor src/app/tor \
- --integ --test control.controller \
- --test control.base_controller \
- --test process \
- --log TRACE \
- --log-file stem.log ; then
-   hooray "Stem tests have succeeded"
-   else
+   if [[ "${TOR_VER_AT_LEAST_044}" = 'yes' ]]; then
+ #  This shold probably be part some test-stem make target.
+ if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
+   python3 "${STEM_PATH}/run_tests.py" \
+   --tor src/app/tor \
+   --integ --test control.controller \
+   --test control.base_controller \
+   --test process \
+   --log TRACE \
+   --log-file stem.log ; then
+ hooray "Stem tests have succeeded"
+ else
error "Stem output:"
runcmd tail -1000 "${STEM_PATH}"/test/data/tor_log
runcmd grep -v "SocketClosed" stem.log | tail -1000
FAILED_TESTS="${FAILED_TESTS} stem"
+ fi
+   else
+   skipping "Stem: broken with <= 0.4.3. See bug tor#40077"
fi
end_section "Stem"
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] CI: Turn on stem with 044 and later.

2020-08-12 Thread nickm

commit 41a7ab96e578e58f277b34f5735d35a2a168da09
Author: Nick Mathewson 
Date:   Wed Aug 12 20:13:18 2020 -0400

CI: Turn on stem with 044 and later.
---
 .gitlab-ci.yml  |  7 +++
 scripts/ci/ci-driver.sh | 34 +++---
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ed615687b..c77e78764d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,6 +37,7 @@ variables:
 paths:
   - artifacts/
 
+# This template
 .apt-template:  |
   export LC_ALL=C.UTF-8
   echo Etc/UTC > /etc/timezone
@@ -90,9 +91,7 @@ debian-minimal:
 - ./scripts/ci/ci-driver.sh
 
 
-# TODO: This one just takes too long to finish right now!
-# Maybe we need to divide the call to ./src/test/test into a few segments,
-# that all end in similar amount of time?
+# TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
   <<: *debian-template
@@ -128,6 +127,6 @@ debian-integration:
   variables:
 CHECK: "no"
 CHUTNEY: "yes"
-# STEM: "yes" -- currently failing on <044.
+STEM: "yes"
   script:
 - ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 6faffd7b40..527bba82e5 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -267,18 +267,26 @@ TOR_VERSION=$(grep -m 1 AC_INIT configure.ac | sed -e 
's/.*\[//; s/\].*//;')
 # Use variables like these when we need to behave differently depending on
 # Tor version.  Only create the variables we need.
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 
 # These are the currently supported Tor versions; no need to work with anything
 # ancient in this script.
 case "$TOR_VERSION" in
 0.3.*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
 ;;
 0.4.[012].*)
 TOR_VER_AT_LEAST_043=no
+TOR_VER_AT_LEAST_044=no
+;;
+0.4.3.*)
+TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=no
 ;;
 *)
 TOR_VER_AT_LEAST_043=yes
+TOR_VER_AT_LEAST_044=yes
 ;;
 esac
 
@@ -427,21 +435,25 @@ fi
 
 if [[ "${STEM}" = "yes" ]]; then
start_section "Stem"
-   #  This shold probably be part some test-stem make target.
-   if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
- python3 "${STEM_PATH}/run_tests.py" \
- --tor src/app/tor \
- --integ --test control.controller \
- --test control.base_controller \
- --test process \
- --log TRACE \
- --log-file stem.log ; then
-   hooray "Stem tests have succeeded"
-   else
+   if [[ "${TOR_VER_AT_LEAST_044}" = 'yes' ]]; then
+ #  This shold probably be part some test-stem make target.
+ if runcmd timelimit -p -t 520 -s USR1 -T 30 -S ABRT \
+   python3 "${STEM_PATH}/run_tests.py" \
+   --tor src/app/tor \
+   --integ --test control.controller \
+   --test control.base_controller \
+   --test process \
+   --log TRACE \
+   --log-file stem.log ; then
+ hooray "Stem tests have succeeded"
+ else
error "Stem output:"
runcmd tail -1000 "${STEM_PATH}"/test/data/tor_log
runcmd grep -v "SocketClosed" stem.log | tail -1000
FAILED_TESTS="${FAILED_TESTS} stem"
+ fi
+   else
+   skipping "Stem: broken with <= 0.4.3. See bug tor#40077"
fi
end_section "Stem"
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.3] Improve comments in .gitlab-ci.yml

2020-08-12 Thread nickm

commit aeafb7f44f07136101c06ea2986b295ef9915c9c
Author: Nick Mathewson 
Date:   Wed Aug 12 20:20:58 2020 -0400

Improve comments in .gitlab-ci.yml
---
 .gitlab-ci.yml | 27 ++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c77e78764d..176c71f8f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,12 +58,18 @@ variables:
   <<: *artifacts-template
   variables:
 DEBIAN_FRONTEND: "noninteractive"
+  # TODO: Using "cache" in this way speeds up our downloads.  It would be
+  # even better, though, to start with a pre-upgraded debian image.
+  #
+  # TODO: Will we have to do this differently once we have more than one
+  # debian version that we're using?
   cache:
 key: apt
 paths:
   - apt-cache
   before_script:
 - *apt-template
+# Install patches unconditionally.
 - apt-get install
 automake
 build-essential
@@ -77,20 +83,28 @@ variables:
 pkg-config
 python3
 zlib1g-dev
+# Install patches that we only need for some use cases.
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
 - if [ "$STEM" = yes ]; then apt-get install timelimit; fi
 - if [ "$CC" = clang ]; then apt-get install clang; fi
+# TODO: This next line should not be debian-only.
 - if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+# TODO: This next line should not be debian-only.
 - if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
+# Minmal check on debian: just make, make check.
+#
 debian-minimal:
   image: debian:stable
   <<: *debian-template
   script:
 - ./scripts/ci/ci-driver.sh
 
-
+#
+# Run "make check" with a hardened clang on debian stable.  This takes
+# care of a hardening check, and a compile-with-clang check.
+#
 # TODO: This will be faster once we merge #40098 and #40099.
 debian-hardened:
   image: debian:testing
@@ -101,6 +115,8 @@ debian-hardened:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Distcheck on debian stable
 debian-distcheck:
   image: debian:stable
   <<: *debian-template
@@ -110,6 +126,8 @@ debian-distcheck:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Documentation tests on debian stable: doxygen and asciidoc.
 debian-docs:
   image: debian:stable
   <<: *debian-template
@@ -121,6 +139,13 @@ debian-docs:
   script:
 - ./scripts/ci/ci-driver.sh
 
+#
+# Integration tests on debian stable: chutney and stem.
+#
+# TODO: It would be cool if this target didn't have to re-build tor, and
+#   could instead re-use Tor from debian-minimal.  That can be done
+#   with the 'artifacts' mechanism, in theory, but it would be good to
+#   avoid having to have a system with hundreds of artifacts.
 debian-integration:
   image: debian:stable
   <<: *debian-template



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Changelog draft for 0.4.4.4-rc

2020-08-12 Thread nickm

commit 9b3e721d74fa6c40d1dabb678054de277d0e3f9a
Author: Nick Mathewson 
Date:   Wed Aug 12 14:52:23 2020 -0400

Changelog draft for 0.4.4.4-rc
---
 ChangeLog   | 56 +
 changes/bug31036|  3 ---
 changes/bug34086|  3 ---
 changes/bug40072|  4 
 changes/bug40076|  5 -
 changes/bug40083|  5 -
 changes/bug40095|  4 
 changes/ticket33747 |  7 ---
 changes/ticket40081 |  6 --
 changes/ticket6198  |  3 ---
 10 files changed, 56 insertions(+), 40 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 65891fefa9..7ef8c543c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,59 @@
+Changes in version 0.4.4.4-rc - 2020-08-12
+  Tor 0.4.4.4-rc is the first release candidate in its series. It fixes
+  several bugs in previous versions, including some that caused annoying
+  behavior for relay and bridge operators.
+
+  o Minor features (security):
+- Channels using obsolete versions of the Tor link protocol are no
+  longer allowed to circumvent address-canonicity checks. (This is
+  only a minor issue, since such channels have no way to set ed25519
+  keys, and therefore should always be rejected for circuits that
+  specify ed25519 identities.) Closes ticket 40081.
+
+  o Minor features (defense in depth):
+- Wipe more data from connection address fields before returning
+  them to the memory heap. Closes ticket 6198.
+
+  o Minor bugfixes (correctness, buffers):
+- Fix a correctness bug that could cause an assertion failure if we
+  ever tried using the buf_move_all() function with an empty input
+  buffer. As far as we know, no released versions of Tor do this.
+  Fixes bug 40076; bugfix on 0.3.3.1-alpha.
+
+  o Minor bugfixes (linux seccomp2 sandbox):
+- Fix startup crash with seccomp sandbox enabled when tor tries to
+  open the data directory. Patch from Daniel Pinto. Fixes bug 40072;
+  bugfix on 0.4.4.3-alpha-dev.
+
+  o Minor bugfixes (onion service v3):
+- Remove a BUG() warning that could trigger in certain unlikely
+  edge-cases. Fixes bug 34086; bugfix on 0.3.2.1-alpha.
+
+  o Minor bugfixes (rate limiting, bridges, pluggable transports):
+- On a bridge, treat all connections from an ExtORPort as remote by
+  default for the purposes of rate-limiting. Previously, bridges
+  would treat the connection as local unless they explicitly
+  received a "USERADDR" command. ExtORPort connections still count
+  as local if there is a USERADDR command with an explicit local
+  address. Fixes bug 33747; bugfix on 0.2.5.1-alpha.
+
+  o Minor bugfixes (relay, self-testing):
+- When starting up as a relay, if we haven't been able to verify
+  that we're reachable, only launch reachability tests at most once
+  a minute. Previously, we had been launching tests up to once a
+  second, which was needlessly noisy. Fixes bug 40083; bugfix
+  on 0.2.8.1-alpha.
+
+  o Minor bugfixes (testing):
+- When running the subsystem order check, use the python binary
+  configured with the PYTHON environment variable. Fixes bug 40095;
+  bugfix on 0.4.4.1-alpha.
+
+  o Minor bugfixes (windows):
+- Fix a bug that prevented Tor from starting if its log file grew
+  above 2GB. Fixes bug 31036; bugfix on 0.2.1.8-alpha.
+
+
 Changes in version 0.4.4.3-alpha - 2020-07-27
   Tor 0.4.4.3-alpha fixes several annoyances in previous versions,
   including one affecting NSS users, and several affecting the Linux
diff --git a/changes/bug31036 b/changes/bug31036
deleted file mode 100644
index d9921dba43..00
--- a/changes/bug31036
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (windows):
-- Fix a bug that prevented Tor from starting if its log file
-  grew above 2GB.  Fixes bug 31036; bugfix on 0.2.1.8-alpha.
diff --git a/changes/bug34086 b/changes/bug34086
deleted file mode 100644
index 245992f8f4..00
--- a/changes/bug34086
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Minor bugfixes (onion service v3):
-- Remove a BUG() warning that could trigger in certain unlikely edge-cases.
-  Fixes bug 34086; bugfix on 0.3.2.1-alpha.
diff --git a/changes/bug40072 b/changes/bug40072
deleted file mode 100644
index 2b82f3f18b..00
--- a/changes/bug40072
+++ /dev/null
@@ -1,4 +0,0 @@
-  o Minor bugfixes (linux seccomp2 sandbox):
-- Fix startup crash with seccomp sandbox enabled when tor tries to
-  open the data directory. Patch from Daniel Pinto. Fixes bug 40072;
-  bugfix on 0.4.4.3-alpha-dev.
diff --git a/changes/bug40076 b/changes/bug40076
deleted file mode 100644
index 9ef5969ae8..00
--- a/changes/bug40076
+++ /dev/null
@@ -1,5 +0,0 @@
-  o Minor bugfixes (correctness, buffers):
-- Fix a correctness bug that could cause an assertion failure if we ever
-  tried using the buf_move_all() function with an empty input.
-  As far as we know, no released versions of Tor

[tor-commits] [tor/release-0.4.4] small edits to 0444-rc changelog

2020-08-12 Thread nickm

commit a2e64b3e85da186eaaf87fff939cc1c5b36a2f5e
Author: Nick Mathewson 
Date:   Wed Aug 12 19:53:27 2020 -0400

small edits to 0444-rc changelog
---
 ChangeLog | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7ef8c543c3..4e584e8fad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-Changes in version 0.4.4.4-rc - 2020-08-12
+Changes in version 0.4.4.4-rc - 2020-08-13
   Tor 0.4.4.4-rc is the first release candidate in its series. It fixes
   several bugs in previous versions, including some that caused annoying
   behavior for relay and bridge operators.
@@ -45,7 +45,7 @@ Changes in version 0.4.4.4-rc - 2020-08-12
   on 0.2.8.1-alpha.
 
   o Minor bugfixes (testing):
-- When running the subsystem order check, use the python binary
+- When running the subsystem order check, use the Python binary
   configured with the PYTHON environment variable. Fixes bug 40095;
   bugfix on 0.4.4.1-alpha.
 

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [stem/master] Present a safer pkill command

2020-08-12 Thread atagar

commit daed7bca9f930e03a89ce8a4254e02a5310a0fc1
Author: Damian Johnson 
Date:   Wed Aug 12 15:41:46 2020 -0700

Present a safer pkill command

pkill's '-x' flag picks a process via an exact match rather than a regex.
Caught thanks to uokf...

  17:16 < uokf> I'd like to make a suggestion to change 
https://stem.torproject.org/faq.html#how-do-i-reload-my-torrc
  17:17 < uokf> it says pkill -sighup tor
  17:17 < uokf> but it should say pkill -x -sighup tor
  17:17 < uokf> pkill sends the signal to all matching pids
  17:18 <@arma> so if you have a process called 'extractor' then it'll hit 
that one too?
  17:18 <@arma> that seems like a good bug. can you open a ticket for stem? 
i think atagar likes his tickets in github but i'm not sure.
---
 docs/faq.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index a7333fc7..50c9786a 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -444,7 +444,7 @@ Tor is configured through its `torrc
 you need to either restart Tor or issue a **HUP** for the changes to be
 reflected. To issue a HUP you can either...
 
- * Run **pkill -sighup tor**.
+ * Run **pkill -x -sighup tor**.
  * Send Tor a **HUP** signal through its control port...
 
 ::

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2020-08-12 Thread translation

commit cc219f7e1201432e9c140402d2e081f8efe12e3e
Author: Translation commit bot 
Date:   Wed Aug 12 21:48:09 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ar.po | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/contents+ar.po b/contents+ar.po
index 3d6ed391d7..331f1521d6 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -8901,6 +8901,12 @@ msgid ""
 "[Facebook](https://www.facebook.com/notes/protect-the-graph/making-;
 "connections-to-facebook-more-secure/1526085754298237/)."
 msgstr ""
+"ÙØªÙ Ø§ÙØ§Ø¹ØªÙØ§Ø¯ Ø£ÙØ¶ÙØ§ Ø¹ÙÙ Ø®Ø¯ÙØ§Øª Onion ÙÙØ¯Ø±Ø¯Ø´Ø© 
Ø§ÙØ®Ø§ÙÙØ© ÙÙ Ø§ÙØ¨ÙØ§ÙØ§Øª Ø§ÙÙØµÙÙØ© "
+"ÙÙØ´Ø§Ø±ÙØ© Ø§ÙÙÙÙØ§Øª Ø ÙØ§ÙØªÙØ§Ø¹Ù Ø§ÙØ¢ÙÙ Ø¨ÙÙ 
Ø§ÙØµØÙÙÙÙ ÙÙØµØ§Ø¯Ø±ÙÙ ÙØ«Ù [SecureDrop] "
+"(https://securedrop.org/) Ø£Ù [OnionShare] (https://onionshare.org/ ) "
+"ÙØªØØ¯ÙØ«Ø§Øª Ø§ÙØ¨Ø±Ø§ÙØ¬ Ø§ÙØ£ÙØ«Ø± Ø£ÙØ§ÙÙØ§ ÙØ·Ø±Ù Ø£ÙØ«Ø± 
Ø£ÙØ§ÙÙØ§ ÙÙÙØµÙÙ Ø¥ÙÙ ÙÙØ§ÙØ¹ Ø§ÙÙÙØ¨ "
+"Ø§ÙØ´ÙÙØ±Ø© ÙØ«Ù [Facebook] 
(https://www.facebook.com/notes/protect-the-graph;
+"/making-connections-to-facebook-more-secure/1526085754298237 /)."
 
 #: https//support.torproject.org/onionservices/onionservices-2/
 #: (content/onionservices/onionservices-2/contents+en.lrquestion.description)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2020-08-12 Thread translation

commit 4e269312f72252b3e52ba382828bdf73533885f1
Author: Translation commit bot 
Date:   Wed Aug 12 18:48:11 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ar.po | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/contents+ar.po b/contents+ar.po
index d829b7fa39..3d6ed391d7 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -8850,6 +8850,8 @@ msgid ""
 "Websites that are only accessible over Tor are called \"onions\" and end in "
 "the TLD .onion."
 msgstr ""
+"ØªØ³ÙÙ ÙÙØ§ÙØ¹ Ø§ÙÙÙØ¨ Ø§ÙØªÙ ÙÙÙÙ Ø§ÙÙØµÙÙ Ø¥ÙÙÙØ§ 
Ø¹Ø¨Ø± Tor  \"onions\" ÙØªÙØªÙÙ Ø¨ÙTLD "
+".onion."
 
 #: https//support.torproject.org/onionservices/onionservices-1/
 #: (content/onionservices/onionservices-1/contents+en.lrquestion.description)
@@ -8857,11 +8859,13 @@ msgid ""
 "For example, the DuckDuckGo onion is "
 "[https://3g2upl4pq6kufc4m.onion](https://3g2upl4pq6kufc4m.onion)."
 msgstr ""
+"Ø¹ÙÙ Ø³Ø¨ÙÙ Ø§ÙÙØ«Ø§Ù Ø onion DuckDuckGo ÙÙ 
[https://3g2upl4pq6kufc4m.onion] "
+"(https://3g2upl4pq6kufc4m.onion)."
 
 #: https//support.torproject.org/onionservices/onionservices-1/
 #: (content/onionservices/onionservices-1/contents+en.lrquestion.description)
 msgid "You can access these websites by using Tor Browser."
-msgstr ""
+msgstr "ÙÙÙÙÙ Ø§ÙÙØµÙÙ Ø¥ÙÙ ÙØ°Ù Ø§ÙÙÙØ§ÙØ¹ Ø¨Ø§Ø³ØªØ®Ø¯Ø§Ù 
ÙØªØµÙØ Tor."
 
 #: https//support.torproject.org/onionservices/onionservices-1/
 #: (content/onionservices/onionservices-1/contents+en.lrquestion.description)
@@ -8869,6 +8873,8 @@ msgid ""
 "The addresses must be shared with you by the website host, as onions are not"
 " indexed in search engines in the typical way that vanilla websites are."
 msgstr ""
+"ÙØ¬Ø¨ ÙØ´Ø§Ø±ÙØ© Ø§ÙØ¹ÙØ§ÙÙÙ ÙØ¹Ù ÙÙ ÙØ¨Ù ÙØ¶ÙÙ Ø§ÙÙÙÙØ¹ 
Ø ØÙØ« ÙØ§ ØªØªÙ ÙÙØ±Ø³Ø© onion ÙÙ "
+"ÙØØ±ÙØ§Øª Ø§ÙØ¨ØØ« Ø¨Ø§ÙØ·Ø±ÙÙØ© Ø§ÙÙØ¹ØªØ§Ø¯Ø© ÙØ«Ù ÙÙØ§ÙØ¹ 
Ø§ÙÙØ§ÙÙÙÙØ§."
 
 #: https//support.torproject.org/onionservices/onionservices-2/
 #: (content/onionservices/onionservices-2/contents+en.lrquestion.title)
@@ -8881,6 +8887,8 @@ msgid ""
 "Onion services allow people to browse but also to publish anonymously, "
 "including publishing anonymous websites."
 msgstr ""
+"ØªØ³ÙØ Ø®Ø¯ÙØ§Øª Onion ÙÙØ£Ø´Ø®Ø§Øµ Ø¨Ø§ÙØªØµÙØ ÙÙÙÙ Ø£ÙØ¶ÙØ§ 
ÙÙÙØ´Ø± Ø¯ÙÙ Ø§ÙÙØ´Ù Ø¹Ù ÙÙÙØªÙÙ Ø Ø¨ÙØ§ "
+"ÙÙ Ø°ÙÙ ÙØ´Ø± ÙÙØ§ÙØ¹ Ø§ÙÙÙØ¨ Ø§ÙÙØ¬ÙÙÙØ©."
 
 #: https//support.torproject.org/onionservices/onionservices-2/
 #: (content/onionservices/onionservices-2/contents+en.lrquestion.description)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Add test for torrc %include functionality and seccomp sandbox

2020-08-12 Thread nickm

commit 49dab42782e06e51c218cf40b8cbb98b80d9803f
Author: Daniel Pinto 
Date:   Wed Jun 3 22:09:51 2020 +0100

Add test for torrc %include functionality and seccomp sandbox

Tests %include with files and folders, modifying and reloading
the config file with sandbox enabled and reponse of SAVECONF and
getinfo config-can-saveconf control commmands.
---
 .travis.yml  |   4 +-
 src/test/include.am  |   3 +
 src/test/test_include.py | 196 +++
 src/test/test_include.sh | 111 +++
 4 files changed, 312 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 01343e65d9..aaca3a7368 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -237,8 +237,8 @@ install:
   - dd ibs=1 count=1024 if=/dev/urandom > ~/.torrc
 
 script:
-  # Skip test_rebind on macOS
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export 
TOR_SKIP_TEST_REBIND=true; fi
+  # Skip test_rebind and test_include on macOS
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export 
TOR_SKIP_TEST_REBIND=true; export TOR_SKIP_TEST_INCLUDE=true; fi
   - ./autogen.sh
   - CONFIGURE_FLAGS="$ASCIIDOC_OPTIONS $COVERAGE_OPTIONS $HARDENING_OPTIONS 
$MODULES_OPTIONS $NSS_OPTIONS $OPENSSL_OPTIONS $RUST_OPTIONS 
--enable-fatal-warnings --disable-silent-rules"
   - echo "Configure flags are $CONFIGURE_FLAGS CC=\"$CC $C_DIALECT_OPTIONS\""
diff --git a/src/test/include.am b/src/test/include.am
index c049053438..478547d655 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -46,6 +46,7 @@ else
 # Only do this when coverage is not on, since it invokes lots of code
 # in a kind of unpredictable way.
 TESTSCRIPTS += src/test/test_rebind.sh
+TESTSCRIPTS += src/test/test_include.sh
 endif
 endif
 
@@ -431,6 +432,8 @@ EXTRA_DIST += \
src/test/slownacl_curve25519.py \
src/test/test_rebind.sh \
src/test/test_rebind.py \
+   src/test/test_include.sh \
+   src/test/test_include.py \
src/test/zero_length_keys.sh \
scripts/maint/run_check_subsystem_order.sh \
src/test/rust_supp.txt \
diff --git a/src/test/test_include.py b/src/test/test_include.py
new file mode 100644
index 00..0ac87ee8fb
--- /dev/null
+++ b/src/test/test_include.py
@@ -0,0 +1,196 @@
+# Future imports for Python 2.7, mandatory in 3.0
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import errno
+import logging
+import os
+import random
+import socket
+import subprocess
+import sys
+import time
+import re
+
+CONTROL_SOCK_TIMEOUT = 10.0
+LOG_TIMEOUT = 60.0
+LOG_WAIT = 0.1
+
+def fail(msg):
+logging.error('FAIL')
+sys.exit(msg)
+
+def skip(msg):
+logging.warning('SKIP: {}'.format(msg))
+sys.exit(77)
+
+def wait_for_log(s):
+cutoff = time.time() + LOG_TIMEOUT
+while time.time() < cutoff:
+l = tor_process.stdout.readline()
+l = l.decode('utf8', 'backslashreplace')
+if s in l:
+logging.info('Tor logged: "{}"'.format(l.strip()))
+return
+# readline() returns a blank string when there is no output
+# avoid busy-waiting
+if len(l) == 0:
+logging.debug('Tor has not logged anything, waiting for 
"{}"'.format(s))
+time.sleep(LOG_WAIT)
+else:
+logging.info('Tor logged: "{}", waiting for 
"{}"'.format(l.strip(), s))
+fail('Could not find "{}" in logs after {} seconds'.format(s, LOG_TIMEOUT))
+
+def pick_random_port():
+port = 0
+random.seed()
+
+for i in range(8):
+port = random.randint(1, 6)
+s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+if s.connect_ex(('127.0.0.1', port)) == 0:
+s.close()
+else:
+break
+
+if port == 0:
+fail('Could not find a random free port between 1 and 6')
+
+return port
+
+def check_control_list(control_out_file, expected, value_name):
+received_count = 0
+for e in expected:
+received = control_out_file.readline().strip()
+received_count += 1
+parts = re.split('[ =-]', received.strip())
+if len(parts) != 3 or parts[0] != '250' or parts[1] != value_name or 
parts[2] != e:
+fail('Unexpected value in response line "{}". Expected {} for 
value {}'.format(received, e, value_name))
+if received.startswith('250 '):
+break
+
+if received_count != len(expected):
+fail('Expected response with {} lines but received {} 
lines'.format(len(expected), received_count))
+
+
+logging.basicConfig(level=logging.DEBUG,
+format='%(asctime)s.%(msecs)03d %(message)s',
+datefmt='%Y-%m-%d %H:%M:%S')
+
+if sys.hexversion < 0x0207:
+fail("ERROR: unsupported Python version (should be >= 2.7)")
+
+if sys.hexversion > 0x0300 and sys.hexversion < 0x0301:
+fail("ERROR: unsupported Python3 version

[tor-commits] [tor/master] Fix small memory leak in config include tests

2020-08-12 Thread nickm

commit 3c70f26dc07cea98e009dc8b15009ca8e72ba226
Author: Daniel Pinto 
Date:   Wed Jun 3 22:09:54 2020 +0100

Fix small memory leak in config include tests

Tests that used options_init_from_string were not freeing calling
config_free_all().
---
 src/test/test_config.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/test/test_config.c b/src/test/test_config.c
index 617a52b8ac..cb88b95761 100644
--- a/src/test/test_config.c
+++ b/src/test/test_config.c
@@ -5875,6 +5875,7 @@ test_config_include_flag_both_without(void *data)
 
  done:
   tor_free(errmsg);
+  config_free_all();
 }
 
 static void
@@ -5915,6 +5916,7 @@ test_config_include_flag_torrc_only(void *data)
   tor_free(errmsg);
   tor_free(path);
   tor_free(dir);
+  config_free_all();
 }
 
 static void
@@ -5955,6 +5957,7 @@ test_config_include_flag_defaults_only(void *data)
   tor_free(errmsg);
   tor_free(path);
   tor_free(dir);
+  config_free_all();
 }
 
 static void



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Add support for patterns on %include #25140

2020-08-12 Thread nickm

commit 34fa2c4d0d8117b75c5c52a7c825486eb0284ae0
Author: Daniel Pinto 
Date:   Wed Jun 3 22:09:42 2020 +0100

Add support for patterns on %include #25140

Also adds generic tor_glob function to expand globs.
---
 configure.ac  |   5 +-
 doc/man/tor.1.txt |  12 +-
 scripts/codegen/fuzzing_include_am.py |   2 +-
 src/app/include.am|   4 +-
 src/config/torrc.sample.in|  13 +-
 src/lib/fs/conffile.c | 141 +++
 src/lib/fs/files.c|  16 ++
 src/lib/fs/files.h|   2 +
 src/lib/fs/path.c | 296 +++
 src/lib/fs/path.h |   7 +
 src/lib/sandbox/sandbox.c |   2 +
 src/lib/string/util_string.c  |   9 +
 src/lib/string/util_string.h  |   1 +
 src/test/fuzz/include.am  |   2 +-
 src/test/include.am   |  21 +-
 src/test/test_config.c| 346 ++-
 src/test/test_helpers.c   |  83 +++
 src/test/test_helpers.h   |   2 +
 src/test/test_util.c  | 436 ++
 src/tools/include.am  |   8 +-
 20 files changed, 1330 insertions(+), 78 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3076f2f1ff..b53df59148 100644
--- a/configure.ac
+++ b/configure.ac
@@ -866,6 +866,7 @@ dnl Where do you live, libevent?  And how do we call you?
 if test "$bwin32" = "true"; then
   TOR_LIB_WS32=-lws2_32
   TOR_LIB_IPHLPAPI=-liphlpapi
+  TOR_LIB_SHLWAPI=-lshlwapi
   # Some of the cargo-cults recommend -lwsock32 as well, but I don't
   # think it's actually necessary.
   TOR_LIB_GDI=-lgdi32
@@ -878,6 +879,7 @@ fi
 AC_SUBST(TOR_LIB_WS32)
 AC_SUBST(TOR_LIB_GDI)
 AC_SUBST(TOR_LIB_IPHLPAPI)
+AC_SUBST(TOR_LIB_SHLWAPI)
 AC_SUBST(TOR_LIB_USERENV)
 
 tor_libevent_pkg_redhat="libevent"
@@ -1646,7 +1648,8 @@ AC_CHECK_HEADERS([errno.h \
  sys/utime.h \
  sys/wait.h \
  syslog.h \
- utime.h])
+ utime.h \
+ glob.h])
 
 AC_CHECK_HEADERS(sys/param.h)
 
diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index ca54fa125b..bb01315d46 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -205,14 +205,22 @@ backslash character (\) before the end of the line.  
Comments can be used in
 such multiline entries, but they must start at the beginning of a line.
 
 Configuration options can be imported from files or folders using the %include
-option with the value being a path. If the path is a file, the options from the
+option with the value being a path. This path can have wildcards. Wildcards 
are 
+expanded first, using lexical order. Then, for each matching file or folder, 
the 
+following rules are followed: if the path is a file, the options from the 
 file will be parsed as if they were written where the %include option is. If
 the path is a folder, all files on that folder will be parsed following lexical
-order. Files starting with a dot are ignored. Files on subfolders are ignored.
+order. Files starting with a dot are ignored. Files in subfolders are ignored.
 The %include option can be used recursively.
 New configuration files or directories cannot be added to already running Tor
 instance if **Sandbox** is enabled.
 
+The supported wildcards are * meaning any number of characters including none
+and ? meaning exactly one character. These characters can be escaped by 
preceding
+them with a backslash, except on Windows. Files starting with a dot are not 
matched
+when expanding wildcards unless the starting dot is explicitly in the pattern, 
except
+on Windows.
+
 By default, an option on the command line overrides an option found in the
 configuration file, and an option in a configuration file overrides one in
 the defaults file.
diff --git a/scripts/codegen/fuzzing_include_am.py 
b/scripts/codegen/fuzzing_include_am.py
index ae50563074..b3892b6fd3 100755
--- a/scripts/codegen/fuzzing_include_am.py
+++ b/scripts/codegen/fuzzing_include_am.py
@@ -35,7 +35,7 @@ FUZZING_LIBS = \
$(rust_ldadd) \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ \
@TOR_LIBEVENT_LIBS@ $(TOR_LIBS_CRYPTLIB) \
-   @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ 
@CURVE25519_LIBS@ \
+   @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_SHLWAPI@ @TOR_LIB_GDI@ 
@TOR_LIB_USERENV@ @CURVE25519_LIBS@ \
@TOR_SYSTEMD_LIBS@ \
@TOR_LZMA_LIBS@ \
@TOR_ZSTD_LIBS@
diff --git a/src/app/include.am b/src/app/include.am
index 3caa0bab1c..8488a1bf19 100644
--- a/src/app/include.am
+++ b/src/app/include.am
@@ -18,7 +18,7 @@ src_app_tor_LDFLAGS = @TOR_LDFLAGS_zlib@ 
$(TOR_LDFLAGS_CRYPTLIB) @TOR_LDFLAGS_li
 src_app_tor_LDADD = $(TOR_INTERNAL_LIBS) \
$(rust_ldadd) \
@TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ $(TOR_LIBS_CRYPTLIB) 
\
-

[tor-commits] [tor/master] Merge remote-tracking branch 'tor-gitlab/mr/62'

2020-08-12 Thread nickm

commit e1514420377b2290dfa52fa65374276a66973131
Merge: 11f1fe3aca 60c436d14d
Author: Nick Mathewson 
Date:   Wed Aug 12 14:37:21 2020 -0400

Merge remote-tracking branch 'tor-gitlab/mr/62'

 .travis.yml   |   4 +-
 changes/feature25140  |   3 +
 configure.ac  |   5 +-
 doc/man/tor.1.txt |  14 +-
 scripts/codegen/fuzzing_include_am.py |   2 +-
 src/app/include.am|   4 +-
 src/config/torrc.sample.in|  13 +-
 src/lib/fs/conffile.c | 141 +++
 src/lib/fs/files.c|  16 ++
 src/lib/fs/files.h|   2 +
 src/lib/fs/path.c | 362 
 src/lib/fs/path.h |   7 +
 src/lib/sandbox/sandbox.c |   2 +
 src/lib/string/util_string.c  |   9 +
 src/lib/string/util_string.h  |   1 +
 src/test/fuzz/include.am  |   2 +-
 src/test/include.am   |  24 +-
 src/test/test_config.c| 349 ++-
 src/test/test_helpers.c   |  83 +++
 src/test/test_helpers.h   |   2 +
 src/test/test_include.py  | 196 +++
 src/test/test_include.sh  | 111 +
 src/test/test_util.c  | 436 ++
 src/tools/include.am  |   8 +-
 24 files changed, 1715 insertions(+), 81 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Improved documentation and comments #25140

2020-08-12 Thread nickm

commit 0b633b1f6d022a359806a705bd4a6082d92bd3f3
Author: Daniel Pinto 
Date:   Tue Aug 11 18:26:41 2020 +0100

Improved documentation and comments #25140
---
 doc/man/tor.1.txt |   6 ++--
 src/lib/fs/path.c | 104 --
 2 files changed, 88 insertions(+), 22 deletions(-)

diff --git a/doc/man/tor.1.txt b/doc/man/tor.1.txt
index bb01315d46..3febf43513 100644
--- a/doc/man/tor.1.txt
+++ b/doc/man/tor.1.txt
@@ -206,9 +206,9 @@ such multiline entries, but they must start at the 
beginning of a line.
 
 Configuration options can be imported from files or folders using the %include
 option with the value being a path. This path can have wildcards. Wildcards 
are 
-expanded first, using lexical order. Then, for each matching file or folder, 
the 
-following rules are followed: if the path is a file, the options from the 
-file will be parsed as if they were written where the %include option is. If
+expanded first, then sorted using lexical order. Then, for each matching file 
or 
+folder, the following rules are followed: if the path is a file, the options 
from 
+the file will be parsed as if they were written where the %include option is. 
If
 the path is a folder, all files on that folder will be parsed following lexical
 order. Files starting with a dot are ignored. Files in subfolders are ignored.
 The %include option can be used recursively.
diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c
index 4532bfb7d1..1a60ca70d4 100644
--- a/src/lib/fs/path.c
+++ b/src/lib/fs/path.c
@@ -44,13 +44,6 @@
 #include 
 #include 
 
-#ifdef _WIN32
-#define IS_GLOB_CHAR(s,i) (((s)[(i)]) == '*' || ((s)[(i)]) == '?')
-#else
-#define IS_GLOB_CHAR(s,i) s)[(i)]) == '*' || ((s)[(i)]) == '?') &&\
-   ((i) == 0 || (s)[(i)-1] != '\\')) /* check escape */
-#endif
-
 /** Removes enclosing quotes from path and unescapes quotes between the
  * enclosing quotes. Backslashes are not unescaped. Return the unquoted
  * path on success or 0 if path is not quoted correctly. */
@@ -321,8 +314,78 @@ make_path_absolute(const char *fname)
 #endif /* defined(_WIN32) */
 }
 
-/** Expands globs in pattern for the path fragment between
- * prev_sep and next_sep. Returns NULL on failure. */
+/* The code below implements tor_glob and get_glob_opened_files. Because it is
+ * not easy to understand it by looking at individual functions, the big
+ * picture explanation here should be read first.
+ *
+ * Purpose of the functions:
+ * - tor_glob - recevies a pattern and returns all the paths that result from
+ *   its glob expansion, globs can be present on all path components.
+ * - get_glob_opened_files - receives a pattern and returns all the paths that
+ *   are opened during its expansion (the paths before any path fragment that
+ *   contains a glob as they have to be opened to check for glob matches). This
+ *   is used to get the paths that have to be added to the seccomp sandbox
+ *   allowed list.
+ *
+ * Due to OS API differences explained below, the implementation of tor_glob is
+ * completly different for Windows and POSIX systems, so we ended up with three
+ * different implementations:
+ * - tor_glob for POSIX - as POSIX glob does everything we need, we simply call
+ *   it and process the results. This is completly implemented in tor_glob.
+ * - tor_glob for WIN32 - because the WIN32 API only supports expanding globs
+ *   in the last path fragment, we need to expand the globs in each path
+ *   fragment manually and call recursively to get the same behaviour as POSIX
+ *   glob. When there are no globs in pattern, we know we are on the last path
+ *   fragment and collect the full path.
+ * - get_glob_opened_files - because the paths before any path fragment with a
+ *   glob will be opened to check for matches, we need to collect them and we
+ *   need to expand the globs in each path fragments and call recursively until
+ *   we find no more globs.
+ *
+ * As seen from the description above, both tor_glob for WIN32 and
+ * get_glob_opened_files receive a pattern and return a list of paths and have
+ * to expand all path fragments that contain globs and call themselves
+ * recursively. The differences are:
+ * - get_glob_opened_files collects paths before path fragments with globs
+ *   while tor_glob for WIN32 collects full paths resulting from the expansion
+ *   of all globs.
+ * - get_glob_opened_files can call tor_glob to expand path fragments with
+ *   globs while tor_glob for WIN32 cannot because it IS tor_glob. For tor_glob
+ *   for WIN32, an auxiliary function has to be used for this purpose.
+ *
+ * To avoid code duplication, the logic of tor_glob for WIN32 and
+ * get_glob_opened_files is implemented in get_glob_paths. The differences are
+ * configured by the extra function parameters:
+ * - final - if true, returns a list of paths obtained from expanding pattern
+ *   (implements tor_glob). Otherwise, returns the paths before path fragments
+ *

[tor-commits] [tor/master] Use correct type for gl_closedir to avoid a compiler warning

2020-08-12 Thread nickm

commit 9ef991dbe37b18c1d3af4a5a4d0b674d3f18cc5f
Author: Nick Mathewson 
Date:   Wed Aug 12 14:42:30 2020 -0400

Use correct type for gl_closedir to avoid a compiler warning
---
 src/lib/fs/path.c | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/lib/fs/path.c b/src/lib/fs/path.c
index 1a60ca70d4..f03cecf52d 100644
--- a/src/lib/fs/path.c
+++ b/src/lib/fs/path.c
@@ -553,6 +553,12 @@ prot_lstat(const char *pathname, struct stat *buf)
 {
   return lstat(sandbox_intern_string(pathname), buf);
 }
+/** As closedir, but has the right type for gl_closedir */
+static void
+wrap_closedir(void *arg)
+{
+  closedir(arg);
+}
 #endif /* defined(_WIN32) */
 
 /** Return a new list containing the paths that match the pattern
@@ -580,7 +586,7 @@ tor_glob(const char *pattern)
   typedef void (*gl_closedir)(void *);
   matches.gl_opendir = (gl_opendir) _opendir;
   matches.gl_readdir = (gl_readdir) 
-  matches.gl_closedir = (gl_closedir) 
+  matches.gl_closedir = (gl_closedir) _closedir;
   matches.gl_stat = _stat;
   matches.gl_lstat = _lstat;
 #endif /* defined(GLOB_ALTDIRFUNC) */

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Changes file for #25140

2020-08-12 Thread nickm

commit ac2c4b1e4ae297b33be6c971fd0e4aca1198b282
Author: Daniel Pinto 
Date:   Wed Jun 3 22:09:58 2020 +0100

Changes file for #25140
---
 changes/feature25140 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changes/feature25140 b/changes/feature25140
new file mode 100644
index 00..5202fa11ce
--- /dev/null
+++ b/changes/feature25140
@@ -0,0 +1,3 @@
+  o Minor feature (configuration):
+- Allow the using wildcards (* and ?) with the %include option on 
+  configuration files. Closes ticket 25140. Patch by Daniel Pinto.



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Attempt to fix test_include.py on TravisCI #25140

2020-08-12 Thread nickm

commit 60c436d14d05dcc5e03058a16373c53ff94469c5
Author: Daniel Pinto 
Date:   Wed Aug 12 14:35:51 2020 +0100

Attempt to fix test_include.py on TravisCI #25140
---
 src/test/test_include.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/test_include.py b/src/test/test_include.py
index 0ac87ee8fb..ec261da86c 100644
--- a/src/test/test_include.py
+++ b/src/test/test_include.py
@@ -127,7 +127,7 @@ tor_process = subprocess.Popen([tor_path,
 if tor_process == None:
 fail('ERROR: running tor failed')
 
-wait_for_log('Opened Control listener on')
+wait_for_log('Opened Control listener')
 
 control_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 if control_socket.connect_ex(('127.0.0.1', control_port)):



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2020-08-12 Thread translation

commit 7de0296a7e027e933e3d24c7d2d456b23cf56fbd
Author: Translation commit bot 
Date:   Wed Aug 12 18:18:11 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ar.po | 41 +
 1 file changed, 37 insertions(+), 4 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index d943438f02..d829b7fa39 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -8673,6 +8673,8 @@ msgid ""
 "Relays and bridges report some of the data in 24-hour intervals which may "
 "end at any time of the day."
 msgstr ""
+"ØªÙÙÙ Ø§ÙÙØ±ØÙØ§Øª ÙØ§ÙØ¬Ø³ÙØ± Ø¨Ø§ÙØ¥Ø¨ÙØ§Øº Ø¹Ù Ø¨Ø¹Ø¶ 
Ø§ÙØ¨ÙØ§ÙØ§Øª ÙÙ ÙØªØ±Ø§Øª 24 Ø³Ø§Ø¹Ø© ÙØ§ÙØªÙ ÙØ¯ "
+"ØªÙØªÙÙ ÙÙ Ø£Ù ÙÙØª ÙÙ Ø§ÙÙÙÙ."
 
 #: https//support.torproject.org/metrics/graphs/
 #: (content/metrics/graphs/contents+en.lrquestion.description)
@@ -8680,6 +8682,8 @@ msgid ""
 "And after such an interval is over relays and bridges might take another 18 "
 "hours to report the data."
 msgstr ""
+"ÙØ¨Ø¹Ø¯ Ø§ÙØªÙØ§Ø¡ ÙØ°Ø§ Ø§ÙÙØ§ØµÙ Ø§ÙØ²ÙÙÙ Ø ÙØ¯ ØªØ³ØªØºØ±Ù 
Ø§ÙØ¬Ø³ÙØ± 18 Ø³Ø§Ø¹Ø© Ø£Ø®Ø±Ù ÙÙØ¥Ø¨ÙØ§Øº Ø¹Ù "
+"Ø§ÙØ¨ÙØ§ÙØ§Øª."
 
 #: https//support.torproject.org/metrics/graphs/
 #: (content/metrics/graphs/contents+en.lrquestion.description)
@@ -8688,13 +8692,16 @@ msgid ""
 "the last data point in a graph indicates a recent trend change which is in "
 "fact just an artifact of the algorithm."
 msgstr ""
+"ÙÙØ¯ ÙØ·Ø¹ÙØ§ Ø§ÙØ±Ø³ÙÙ Ø§ÙØ¨ÙØ§ÙÙØ© ÙÙ Ø§ÙÙÙÙÙÙ 
Ø§ÙØ£Ø®ÙØ±ÙÙ Ø ÙØ£ÙÙØ§ ÙØ±ÙØ¯ ØªØ¬ÙØ¨ Ø£Ù ØªØ´ÙØ± Ø¢Ø®Ø± "
+"ÙÙØ·Ø© Ø¨ÙØ§ÙØ§Øª ÙÙ Ø§ÙØ±Ø³Ù Ø§ÙØ¨ÙØ§ÙÙ Ø¥ÙÙ ØªØºÙÙØ± 
ØØ¯ÙØ« ÙÙ Ø§ÙØ§ØªØ¬Ø§Ù ÙÙÙ ÙÙ Ø§ÙÙØ§ÙØ¹ ÙØ¬Ø±Ø¯ "
+"ÙØ·Ø¹Ø© Ø£Ø«Ø±ÙØ© ÙÙØ®ÙØ§Ø±Ø²ÙÙØ©."
 
 #: https//support.torproject.org/metrics/methodology/
 #: (content/metrics/methodology/contents+en.lrquestion.title)
 msgid ""
 "Why do you believe the current approach to estimate user numbers is more "
 "accurate?"
-msgstr ""
+msgstr "ÙÙØ§Ø°Ø§ ØªØ¹ØªÙØ¯ Ø£Ù Ø§ÙÙÙØ¬ Ø§ÙØØ§ÙÙ ÙØªÙØ¯ÙØ± 
Ø£Ø¹Ø¯Ø§Ø¯ Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ Ø£ÙØ«Ø± Ø¯ÙØ©Ø"
 
 #: https//support.torproject.org/metrics/methodology/
 #: (content/metrics/methodology/contents+en.lrquestion.description)
@@ -8702,6 +8709,8 @@ msgid ""
 "For direct users, we include all directories which we didn't do in the old "
 "approach."
 msgstr ""
+"Ø¨Ø§ÙÙØ³Ø¨Ø© ÙÙÙØ³ØªØ®Ø¯ÙÙÙ Ø§ÙÙØ¨Ø§Ø´Ø±ÙÙ Ø ÙÙÙÙ Ø¨ØªØ¶Ù
ÙÙ Ø¬ÙÙØ¹ Ø§ÙØ£Ø¯ÙØ© Ø§ÙØªÙ ÙÙ ÙÙÙ Ø¨ÙØ§ ÙÙ "
+"Ø§ÙØ·Ø±ÙÙØ© Ø§ÙÙØ¯ÙÙØ©."
 
 #: https//support.torproject.org/metrics/methodology/
 #: (content/metrics/methodology/contents+en.lrquestion.description)
@@ -8709,6 +8718,8 @@ msgid ""
 "We also use histories that only contain bytes written to answer directory "
 "requests, which is more precise than using general byte histories."
 msgstr ""
+"ÙØ³ØªØ®Ø¯Ù Ø£ÙØ¶ÙØ§ Ø³Ø¬ÙØ§Øª ØªØØªÙÙ Ø¹ÙÙ ÙØØ¯Ø§Øª Ø¨Ø§ÙØª 
ÙÙØ· ÙÙØªÙØ¨Ø© ÙÙØ¥Ø¬Ø§Ø¨Ø© Ø¹ÙÙ Ø·ÙØ¨Ø§Øª Ø§ÙØ¯ÙÙÙ "
+"Ø ÙÙÙ Ø£ÙØ«Ø± Ø¯ÙØ© ÙÙ Ø§Ø³ØªØ®Ø¯Ø§Ù Ø³Ø¬ÙØ§Øª Ø§ÙØ¨Ø§ÙØª 
Ø§ÙØ¹Ø§ÙØ©."
 
 #: https//support.torproject.org/metrics/stats-report/
 #: (content/metrics/stats-report/contents+en.lrquestion.title)
@@ -8716,6 +8727,8 @@ msgid ""
 "Are there more fine-grained numbers available, for example, on the number of"
 " users per hour?"
 msgstr ""
+"ÙÙ ÙÙØ§Ù Ø§ÙÙØ²ÙØ¯ ÙÙ Ø§ÙØ£Ø±ÙØ§Ù Ø§ÙØ¯ÙÙÙØ© Ø§ÙÙØªØ§ØØ© 
Ø Ø¹ÙÙ Ø³Ø¨ÙÙ Ø§ÙÙØ«Ø§Ù Ø ØÙÙ Ø¹Ø¯Ø¯ "
+"Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ ÙÙ Ø§ÙØ³Ø§Ø¹Ø©Ø"
 
 #: https//support.torproject.org/metrics/stats-report/
 #: (content/metrics/stats-report/contents+en.lrquestion.description)
@@ -8723,6 +8736,8 @@ msgid ""
 "No, the relays that report these statistics aggregate requests by country of"
 " origin and over a period of 24 hours."
 msgstr ""
+"ÙØ§ Ø Ø§ÙÙØ±ØÙØ§Øª Ø§ÙØªÙ ØªÙØ¨ÙØº Ø¹Ù ÙØ°Ù Ø§ÙØ¥ØØµØ§Ø¦ÙØ§Øª 
ØªØ¬ÙØ¹ Ø§ÙØ·ÙØ¨Ø§Øª ØØ³Ø¨ Ø¨ÙØ¯ Ø§ÙÙÙØ´Ø£ ÙØ¹ÙÙ "
+"ÙØ¯Ø§Ø± 24 Ø³Ø§Ø¹Ø©."
 
 #: https//support.torproject.org/metrics/stats-report/
 #: (content/metrics/stats-report/contents+en.lrquestion.description)
@@ -8730,11 +8745,13 @@ msgid ""
 "The statistics we would need to gather for the number of users per hour "
 "would be too detailed and might put users at risk."
 msgstr ""
+"Ø³ØªÙÙÙ Ø§ÙØ¥ØØµØ§Ø¡Ø§Øª Ø§ÙØªÙ Ø³ÙØØªØ§Ø¬ Ø¥ÙÙ Ø¬ÙØ¹ÙØ§ 
ÙØ¹Ø¯Ø¯ Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ ÙÙ Ø§ÙØ³Ø§Ø¹Ø© ÙÙØµÙØ© ÙÙØºØ§ÙØ©"
+" ÙÙØ¯ ØªØ¹Ø±Ø¶ Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ ÙÙØ®Ø·Ø±."
 
 #: https//support.torproject.org/metrics/user-estimation/
 #: (content/metrics/user-estimation/contents+en.lrquestion.title)
 msgid "How is it even possible to count users in an anonymity network?"
-msgstr ""
+msgstr "ÙÙÙ ÙÙÙÙ ØØªÙ Ø¹Ø¯ Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ ÙÙ Ø´Ø¨ÙØ© Ø§ÙÙ
Ø¬ÙÙÙÙØ©Ø"
 
 #: https//support.torproject.org/metrics/user-estimation/
 #: (content/metrics/user-estimation/contents+en.lrquestion.description)
@@ -8743,11

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2020-08-12 Thread translation

commit 5f5206cdae7eb31490131f42133c03cfe10f68b5
Author: Translation commit bot 
Date:   Wed Aug 12 17:48:00 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ar.po | 18 +++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index 173c2f2605..d943438f02 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -8603,11 +8603,13 @@ msgid ""
 "Average number of concurrent users, estimated from data collected over a "
 "day. We can't say how many distinct users there are."
 msgstr ""
+"ÙØªÙØ³Ø· Ø¹Ø¯Ø¯ Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ Ø§ÙÙØªØ²Ø§ÙÙÙÙ Ø ÙÙØ¯Ø±ÙØ§ Ù
Ù Ø§ÙØ¨ÙØ§ÙØ§Øª Ø§ÙØªÙ ØªÙ Ø¬ÙØ¹ÙØ§ Ø¹ÙÙ ÙØ¯Ø§Ø± "
+"ÙÙÙ. ÙØ§ ÙÙÙÙÙØ§ ØªØØ¯ÙØ¯ Ø¹Ø¯Ø¯ Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ Ø§ÙÙØªÙ
ÙØ²ÙÙ."
 
 #: https//support.torproject.org/metrics/country-origin/
 #: (content/metrics/country-origin/contents+en.lrquestion.title)
 msgid "How do you know which countries users come from?"
-msgstr ""
+msgstr "ÙÙÙ ØªØ¹Ø±Ù Ø§ÙØ¨ÙØ¯Ø§Ù Ø§ÙØªÙ ÙØ£ØªÙ ÙÙÙØ§ Ø§ÙÙ
Ø³ØªØ®Ø¯ÙÙÙØ"
 
 #: https//support.torproject.org/metrics/country-origin/
 #: (content/metrics/country-origin/contents+en.lrquestion.description)
@@ -8616,11 +8618,13 @@ msgid ""
 "numbers in aggregate form.  This is one of the reasons why tor ships with a "
 "GeoIP database."
 msgstr ""
+"ØªÙÙÙ Ø§ÙØ¯ÙØ§Ø¦Ù Ø¨ØªØÙÙÙ Ø¹ÙØ§ÙÙÙ IP Ø¥ÙÙ Ø±ÙÙØ² 
Ø§ÙØ¨ÙØ¯Ø§Ù ÙØ§ÙØ¥Ø¨ÙØ§Øº Ø¹Ù ÙØ°Ù Ø§ÙØ£Ø±ÙØ§Ù ÙÙ "
+"Ø´ÙÙ Ø¥Ø¬ÙØ§ÙÙ. ÙØ°Ø§ ÙÙ Ø£ØØ¯ Ø£Ø³Ø¨Ø§Ø¨ Ø´ØÙ tor ÙØ¹ ÙØ§Ø¹Ø¯Ø© 
Ø¨ÙØ§ÙØ§Øª GeoIP."
 
 #: https//support.torproject.org/metrics/directories-reports/
 #: (content/metrics/directories-reports/contents+en.lrquestion.title)
 msgid "Do all directories report these directory request numbers?"
-msgstr ""
+msgstr "ÙÙ ØªÙÙÙ Ø¬ÙÙØ¹ Ø§ÙØ£Ø¯ÙØ© Ø¨Ø§ÙØ¥Ø¨ÙØ§Øº Ø¹Ù Ø£Ø±ÙØ§Ù 
Ø·ÙØ¨Ø§Øª Ø§ÙØ¯ÙÙÙ ÙØ°ÙØ"
 
 #: https//support.torproject.org/metrics/directories-reports/
 #: (content/metrics/directories-reports/contents+en.lrquestion.description)
@@ -8628,6 +8632,8 @@ msgid ""
 "No, but we can see what fraction of directories reported them, and then we "
 "can extrapolate the total number in the network."
 msgstr ""
+"ÙØ§ Ø ÙÙÙÙ ÙÙÙÙÙØ§ Ø£Ù ÙØ±Ù Ø£Ù Ø¬Ø²Ø¡ ÙÙ Ø§ÙØ£Ø¯ÙØ© 
Ø£Ø¨ÙØºØª Ø¹ÙÙØ§ Ø ÙÙÙ Ø«Ù ÙÙÙÙÙØ§ Ø§Ø³ØªÙØ±Ø§Ø¡ "
+"Ø§ÙØ¹Ø¯Ø¯ Ø§ÙØ¥Ø¬ÙØ§ÙÙ ÙÙ Ø§ÙØ´Ø¨ÙØ©."
 
 #: https//support.torproject.org/metrics/graph-data-point/
 #: (content/metrics/graph-data-point/contents+en.lrquestion.title)
@@ -8635,6 +8641,8 @@ msgid ""
 "But I noticed that the last data point went up/down a bit since I last "
 "looked a few hours ago. Why is that?"
 msgstr ""
+"ÙÙÙÙÙ ÙØ§ØØ¸Øª Ø£Ù Ø¢Ø®Ø± ÙÙØ·Ø© Ø¨ÙØ§ÙØ§Øª Ø§Ø±ØªÙØ¹Øª / 
Ø§ÙØ®ÙØ¶Øª ÙÙÙÙØ§Ù ÙÙØ° Ø¢Ø®Ø± ÙØ±Ø© Ø¨ØØ«Øª ÙÙÙØ§ "
+"ÙØ¨Ù Ø³Ø§Ø¹Ø§Øª ÙÙÙÙØ©. ÙÙØ§Ø°Ø§ ÙØ°Ø§Ø"
 
 #: https//support.torproject.org/metrics/graph-data-point/
 #: (content/metrics/graph-data-point/contents+en.lrquestion.description)
@@ -8642,6 +8650,8 @@ msgid ""
 "The reason is that we publish user numbers once we're confident enough that "
 "they won't change significantly anymore."
 msgstr ""
+"ÙØ§ÙØ³Ø¨Ø¨ ÙÙ Ø£ÙÙØ§ ÙÙØ´Ø± Ø£Ø±ÙØ§Ù Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ Ø¨Ù
Ø¬Ø±Ø¯ Ø£Ù ÙÙÙÙ ÙØ§Ø«ÙÙÙ Ø¨Ø¯Ø±Ø¬Ø© ÙØ§ÙÙØ© ÙÙ "
+"Ø£ÙÙØ§ ÙÙ ØªØªØºÙØ± Ø¨Ø´ÙÙ ÙØ¨ÙØ± Ø¨Ø¹Ø¯ Ø§ÙØ¢Ù."
 
 #: https//support.torproject.org/metrics/graph-data-point/
 #: (content/metrics/graph-data-point/contents+en.lrquestion.description)
@@ -8649,11 +8659,13 @@ msgid ""
 "But it's always possible that a directory reports data a few hours after we "
 "were confident enough, but which then slightly changed the graph."
 msgstr ""
+"ÙÙÙÙ ÙÙ Ø§ÙÙÙÙÙ Ø¯Ø§Ø¦ÙÙØ§ Ø£Ù ÙÙÙÙ Ø§ÙØ¯ÙÙÙ 
Ø¨Ø§ÙØ¥Ø¨ÙØ§Øº Ø¹Ù Ø§ÙØ¨ÙØ§ÙØ§Øª Ø¨Ø¹Ø¯ Ø¨Ø¶Ø¹ Ø³Ø§Ø¹Ø§Øª ÙÙ "
+"Ø«ÙØªÙØ§ Ø¨ÙØ§ ÙÙÙ Ø§ÙÙÙØ§ÙØ© Ø ÙÙÙÙ Ø¨Ø¹Ø¯ Ø°ÙÙ ØºÙÙØ± 
Ø§ÙØ±Ø³Ù Ø§ÙØ¨ÙØ§ÙÙ ÙÙÙÙØ§Ù."
 
 #: https//support.torproject.org/metrics/graphs/
 #: (content/metrics/graphs/contents+en.lrquestion.title)
 msgid "Why do the graphs end 2 days in the past and not today?"
-msgstr ""
+msgstr "ÙÙØ§Ø°Ø§ ØªÙØªÙÙ Ø§ÙØ±Ø³ÙÙ Ø§ÙØ¨ÙØ§ÙÙØ© Ø¨ÙÙÙÙÙ ÙÙ 
Ø§ÙÙØ§Ø¶Ù ÙÙÙØ³ Ø§ÙÙÙÙØ"
 
 #: https//support.torproject.org/metrics/graphs/
 #: (content/metrics/graphs/contents+en.lrquestion.description)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal

2020-08-12 Thread translation

commit 75e494b803003472a3577f4db4cfcd1bf4b4a776
Author: Translation commit bot 
Date:   Wed Aug 12 17:18:08 2020 +

https://gitweb.torproject.org/translation.git/commit/?h=support-portal
---
 contents+ar.po | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/contents+ar.po b/contents+ar.po
index 0dba68d1e7..173c2f2605 100644
--- a/contents+ar.po
+++ b/contents+ar.po
@@ -8525,17 +8525,18 @@ msgstr ""
 msgid ""
 "tl;dr: in the old approach we measured the wrong thing, and now we measure "
 "the right thing."
-msgstr ""
+msgstr "ÙÙ Ø§ÙÙÙØ¬ Ø§ÙÙØ¯ÙÙ ÙÙÙØ§ Ø¨ÙÙØ§Ø³ Ø§ÙØ´ÙØ¡ Ø§ÙØ®Ø·Ø£ 
Ø ÙØ§ÙØ¢Ù ÙÙÙØ³ Ø§ÙØ´ÙØ¡ Ø§ÙØµØÙØ."
 
 #: https//support.torproject.org/metrics/bridges-reports/
 #: (content/metrics/bridges-reports/contents+en.lrquestion.title)
 msgid "Why are there so few bridge users that are not using the default OR"
 msgstr ""
+"ÙÙØ§Ø°Ø§ ÙÙØ¬Ø¯ Ø¹Ø¯Ø¯ ÙÙÙÙ Ø¬Ø¯ÙØ§ ÙÙ ÙØ³ØªØ®Ø¯ÙÙ Ø§ÙØ¬Ø³Ø± 
Ø§ÙØ°ÙÙ ÙØ§ ÙØ³ØªØ®Ø¯ÙÙÙ OR Ø§ÙØ§ÙØªØ±Ø§Ø¶Ù"
 
 #: https//support.torproject.org/metrics/bridges-reports/
 #: (content/metrics/bridges-reports/contents+en.lrquestion.title)
 msgid "protocol or that are using IPv6?"
-msgstr ""
+msgstr "Ø§ÙØ¨Ø±ÙØªÙÙÙÙ Ø£Ù Ø§ÙØªÙ ØªØ³ØªØ®Ø¯Ù IPv6Ø"
 
 #: https//support.torproject.org/metrics/bridges-reports/
 #: (content/metrics/bridges-reports/contents+en.lrquestion.description)
@@ -8543,18 +8544,21 @@ msgid ""
 "Very few bridges report data on transports or IP versions yet, and by "
 "default we consider requests to use the default OR protocol and IPv4."
 msgstr ""
+"Ø¹Ø¯Ø¯ ÙÙÙÙ Ø¬Ø¯ÙØ§ ÙÙ Ø§ÙØ¬Ø³ÙØ± ÙØ¨ÙØº Ø¹Ù Ø¨ÙØ§ÙØ§Øª ØÙÙ 
Ø¹ÙÙÙØ§Øª Ø§ÙÙÙÙ Ø£Ù Ø¥ØµØ¯Ø§Ø±Ø§Øª IP ØØªÙ "
+"Ø§ÙØ¢Ù Ø ÙØ¨Ø´ÙÙ Ø§ÙØªØ±Ø§Ø¶Ù ÙØÙ ÙØ£Ø®Ø° ÙÙ Ø§ÙØ§Ø¹ØªØ¨Ø§Ø± 
Ø·ÙØ¨Ø§Øª Ø§Ø³ØªØ®Ø¯Ø§Ù Ø¨Ø±ÙØªÙÙÙÙ OR "
+"Ø§ÙØ§ÙØªØ±Ø§Ø¶Ù Ù IPv4."
 
 #: https//support.torproject.org/metrics/bridges-reports/
 #: (content/metrics/bridges-reports/contents+en.lrquestion.description)
 msgid ""
 "Once more bridges report these data, the numbers will become more accurate."
-msgstr ""
+msgstr "Ø¨ÙØ¬Ø±Ø¯ Ø£Ù ØªØ¨ÙØº Ø§ÙØ¬Ø³ÙØ± Ø¹Ù ÙØ°Ù Ø§ÙØ¨ÙØ§ÙØ§Øª Ø 
Ø³ØªØµØ¨Ø Ø§ÙØ£Ø±ÙØ§Ù Ø£ÙØ«Ø± Ø¯ÙØ©."
 
 #: https//support.torproject.org/metrics/censorship-events/
 #: (content/metrics/censorship-events/contents+en.lrquestion.title)
 msgid ""
 "What are these red and blue dots indicating possible censorship events?"
-msgstr ""
+msgstr "ÙØ§ ÙÙ ÙØ°Ù Ø§ÙÙÙØ§Ø· Ø§ÙØÙØ±Ø§Ø¡ ÙØ§ÙØ²Ø±ÙØ§Ø¡ Ø§ÙØªÙ 
ØªØ´ÙØ± Ø¥ÙÙ Ø£ØØ¯Ø§Ø« Ø±ÙØ§Ø¨Ø© ÙØØªÙÙØ©Ø"
 
 #: https//support.torproject.org/metrics/censorship-events/
 #: (content/metrics/censorship-events/contents+en.lrquestion.description)
@@ -8563,6 +8567,8 @@ msgid ""
 "user numbers over a series of days and predicts the user number in the next "
 "days."
 msgstr ""
+"ÙØÙ ÙØ¯ÙØ± ÙØ¸Ø§ÙÙØ§ ÙØ§ÙØªØ´Ø§Ù Ø§ÙØ±ÙØ§Ø¨Ø© ÙØ§Ø¦ÙÙØ§ 
Ø¹ÙÙ Ø§ÙØ´Ø°ÙØ° ÙØ¨ØØ« ÙÙ Ø£Ø¹Ø¯Ø§Ø¯ Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ "
+"Ø§ÙÙÙØ¯Ø±Ø© Ø¹ÙÙ ÙØ¯Ø§Ø± Ø³ÙØ³ÙØ© ÙÙ Ø§ÙØ£ÙØ§Ù ÙÙØªÙÙØ¹ 
Ø¹Ø¯Ø¯ Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ ÙÙ Ø§ÙØ£ÙØ§Ù Ø§ÙÙØ§Ø¯ÙØ©."
 
 #: https//support.torproject.org/metrics/censorship-events/
 #: (content/metrics/censorship-events/contents+en.lrquestion.description)
@@ -8570,6 +8576,8 @@ msgid ""
 "If the actual number is higher or lower, this might indicate a possible "
 "censorship event or release of censorship."
 msgstr ""
+"Ø¥Ø°Ø§ ÙØ§Ù Ø§ÙØ±ÙÙ Ø§ÙÙØ¹ÙÙ Ø£Ø¹ÙÙ Ø£Ù Ø£ÙÙ Ø ÙÙØ¯ ÙØ´ÙØ± 
Ø°ÙÙ Ø¥ÙÙ Ø§ØØªÙØ§Ù ÙØ¬ÙØ¯ ØØ¯Ø« Ø±ÙØ§Ø¨Ø© Ø£Ù"
+" ØªØØ±ÙØ± ÙÙØ±ÙØ§Ø¨Ø©."
 
 #: https//support.torproject.org/metrics/censorship-events/
 #: (content/metrics/censorship-events/contents+en.lrquestion.description)
@@ -8577,6 +8585,8 @@ msgid ""
 "For more details, see our [technical "
 "report](https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
 msgstr ""
+"ÙÙØ²ÙØ¯ ÙÙ Ø§ÙØªÙØ§ØµÙÙ Ø Ø±Ø§Ø¬Ø¹ [ØªÙØ±ÙØ±ÙØ§ Ø§ÙÙÙÙ] "
+"(https://research.torproject.org/techreports/detector-2011-09-09.pdf)."
 
 #: https//support.torproject.org/metrics/concurrent-users/
 #: (content/metrics/concurrent-users/contents+en.lrquestion.title)
@@ -8584,6 +8594,8 @@ msgid ""
 "So, are these distinct users per day, average number of users connected over"
 " the day, or what?"
 msgstr ""
+"Ø¥Ø°Ù Ø ÙÙ ÙØ¤ÙØ§Ø¡ Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ Ø§ÙÙØªÙÙØ²ÙÙ ÙÙÙ
ÙÙØ§ Ø ÙØªÙØ³Ø· Ø¹Ø¯Ø¯ Ø§ÙÙØ³ØªØ®Ø¯ÙÙÙ Ø§ÙÙØªØµÙÙÙ "
+"Ø¹ÙÙ ÙØ¯Ø§Ø± Ø§ÙÙÙÙ Ø Ø£Ù ÙØ§Ø°Ø§Ø"
 
 #: https//support.torproject.org/metrics/concurrent-users/
 #: (content/metrics/concurrent-users/contents+en.lrquestion.description)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.2] Try disabling "make all" when checking docs.

2020-08-12 Thread nickm

commit 50b7bd243fdea1ae1ab3ee0c3304d9d39246581c
Author: Nick Mathewson 
Date:   Wed Aug 12 11:35:15 2020 -0400

Try disabling "make all" when checking docs.
---
 .gitlab-ci.yml  |  2 +-
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 54 ++---
 3 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3959bba024..8ed615687b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,7 +111,6 @@ debian-distcheck:
   script:
 - ./scripts/ci/ci-driver.sh
 
-# TODO: it would be neat to disable the "make all" part of this one.
 debian-docs:
   image: debian:stable
   <<: *debian-template
@@ -119,6 +118,7 @@ debian-docs:
 DOXYGEN: "yes"
 ASCIIDOC: "yes"
 CHECK: "no"
+RUN_STAGE_BUILD: "no"
   script:
 - ./scripts/ci/ci-driver.sh
 
diff --git a/Makefile.am b/Makefile.am
index 5d18666edc..a868be7362 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,6 +149,8 @@ include src/include.am
 include doc/include.am
 include contrib/include.am
 
+manpages: $(nodist_man1_MANS)
+
 EXTRA_DIST+= \
ChangeLog   \
CONTRIBUTING\
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 05c1415da0..ba4b800c04 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -21,6 +21,11 @@ COLOR_CI="${COLOR_CI:-yes}"
 # Options for which CI system this is.
 ON_GITLAB="${ON_GITLAB:-yes}"
 
+# Options for things we usually won't want to skip.
+RUN_STAGE_CONFIGURE="${RUN_STAGE_CONFIGURE:-yes}"
+RUN_STAGE_BUILD="${RUN_STAGE_BUILD:-yes}"
+RUN_STAGE_TEST="${RUN_STAGE_TEST:-yes}"
+
 # Options for how to build Tor.  All should be yes/no.
 FATAL_WARNINGS="${FATAL_WARNINGS:-yes}"
 HARDENING="${HARDENING:-no}"
@@ -165,33 +170,6 @@ else
 }
 fi
 
-if [[ "$*" == "" ]]; then
-RUN_STAGE_CONFIGURE="yes"
-RUN_STAGE_BUILD="yes"
-RUN_STAGE_TEST="yes"
-else
-RUN_STAGE_CONFIGURE="no"
-RUN_STAGE_BUILD="no"
-RUN_STAGE_TEST="no"
-
-for stage in "$@"; do
-   case "$stage" in
-   configure)
-   RUN_STAGE_CONFIGURE="yes"
-   ;;
-   build)
-   RUN_STAGE_BUILD="yes"
-   ;;
-   test)
-   RUN_STAGE_TEST="yes"
-   ;;
-   *)
-   error "Unknown stage $stage"
-   ;;
-   esac
-done
-fi
-
 #
 # Validate inputs.
 
@@ -206,6 +184,10 @@ yes_or_no RUST
 yes_or_no DOXYGEN
 yes_or_no ASCIIDOC
 
+yes_or_no RUN_STAGE_CONFIGURE
+yes_or_no RUN_STAGE_BUILD
+yes_or_no RUN_STAGE_TEST
+
 yes_or_no CHECK
 yes_or_no STEM
 yes_or_no DISTCHECK
@@ -370,6 +352,7 @@ if [[ "$RUN_STAGE_BUILD" = "yes" ]] ; then
end_section Distcheck
 fi
 fi
+
 ##
 # Run tests.
 
@@ -378,13 +361,6 @@ if [[ "$RUN_STAGE_TEST" == "no" ]]; then
 exit 0
 fi
 
-if [[ "$RUN_STAGE_BUILD" = "no" ]] ; then
-debug "Skipped build stage. Making sure that ./src/app/tor exists."
-if [[ ! -f "./src/app/tor" ]]; then
-   die "$(pwd)/src/app/tor does not exist"
-fi
-fi
-
 FAILED_TESTS=""
 
 if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
@@ -397,6 +373,16 @@ if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 
'yes' ]]; then
 end_section Doxygen
 fi
 
+if [[ "${ASCIIDOC}" = 'yes' ]]; then
+start_section Asciidoc
+if runcmd make manpages; then
+hooray "make manpages has succeeded."
+else
+FAILED_TESTS="${FAILED_TESTS} asciidoc"
+fi
+end_section Asciidoc
+fi
+
 if [[ "${CHECK}" = "yes" ]]; then
 start_section "Check"
 if runcmd make "${make_options[@]}" check; then



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3

2020-08-12 Thread nickm

commit f94ad3d32a92f3709df37ae06b57ca47616a552f
Merge: cff2c3d5fa 309eafbc3c
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.4.3' into release-0.4.3

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-08-12 Thread nickm

commit f98b1988ec5ca1eb3d2923faf43c1df7541efafb
Merge: 670f5632a5 309eafbc3c
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.4.3' into maint-0.4.4

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Try disabling "make all" when checking docs.

2020-08-12 Thread nickm

commit 50b7bd243fdea1ae1ab3ee0c3304d9d39246581c
Author: Nick Mathewson 
Date:   Wed Aug 12 11:35:15 2020 -0400

Try disabling "make all" when checking docs.
---
 .gitlab-ci.yml  |  2 +-
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 54 ++---
 3 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3959bba024..8ed615687b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,7 +111,6 @@ debian-distcheck:
   script:
 - ./scripts/ci/ci-driver.sh
 
-# TODO: it would be neat to disable the "make all" part of this one.
 debian-docs:
   image: debian:stable
   <<: *debian-template
@@ -119,6 +118,7 @@ debian-docs:
 DOXYGEN: "yes"
 ASCIIDOC: "yes"
 CHECK: "no"
+RUN_STAGE_BUILD: "no"
   script:
 - ./scripts/ci/ci-driver.sh
 
diff --git a/Makefile.am b/Makefile.am
index 5d18666edc..a868be7362 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,6 +149,8 @@ include src/include.am
 include doc/include.am
 include contrib/include.am
 
+manpages: $(nodist_man1_MANS)
+
 EXTRA_DIST+= \
ChangeLog   \
CONTRIBUTING\
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 05c1415da0..ba4b800c04 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -21,6 +21,11 @@ COLOR_CI="${COLOR_CI:-yes}"
 # Options for which CI system this is.
 ON_GITLAB="${ON_GITLAB:-yes}"
 
+# Options for things we usually won't want to skip.
+RUN_STAGE_CONFIGURE="${RUN_STAGE_CONFIGURE:-yes}"
+RUN_STAGE_BUILD="${RUN_STAGE_BUILD:-yes}"
+RUN_STAGE_TEST="${RUN_STAGE_TEST:-yes}"
+
 # Options for how to build Tor.  All should be yes/no.
 FATAL_WARNINGS="${FATAL_WARNINGS:-yes}"
 HARDENING="${HARDENING:-no}"
@@ -165,33 +170,6 @@ else
 }
 fi
 
-if [[ "$*" == "" ]]; then
-RUN_STAGE_CONFIGURE="yes"
-RUN_STAGE_BUILD="yes"
-RUN_STAGE_TEST="yes"
-else
-RUN_STAGE_CONFIGURE="no"
-RUN_STAGE_BUILD="no"
-RUN_STAGE_TEST="no"
-
-for stage in "$@"; do
-   case "$stage" in
-   configure)
-   RUN_STAGE_CONFIGURE="yes"
-   ;;
-   build)
-   RUN_STAGE_BUILD="yes"
-   ;;
-   test)
-   RUN_STAGE_TEST="yes"
-   ;;
-   *)
-   error "Unknown stage $stage"
-   ;;
-   esac
-done
-fi
-
 #
 # Validate inputs.
 
@@ -206,6 +184,10 @@ yes_or_no RUST
 yes_or_no DOXYGEN
 yes_or_no ASCIIDOC
 
+yes_or_no RUN_STAGE_CONFIGURE
+yes_or_no RUN_STAGE_BUILD
+yes_or_no RUN_STAGE_TEST
+
 yes_or_no CHECK
 yes_or_no STEM
 yes_or_no DISTCHECK
@@ -370,6 +352,7 @@ if [[ "$RUN_STAGE_BUILD" = "yes" ]] ; then
end_section Distcheck
 fi
 fi
+
 ##
 # Run tests.
 
@@ -378,13 +361,6 @@ if [[ "$RUN_STAGE_TEST" == "no" ]]; then
 exit 0
 fi
 
-if [[ "$RUN_STAGE_BUILD" = "no" ]] ; then
-debug "Skipped build stage. Making sure that ./src/app/tor exists."
-if [[ ! -f "./src/app/tor" ]]; then
-   die "$(pwd)/src/app/tor does not exist"
-fi
-fi
-
 FAILED_TESTS=""
 
 if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
@@ -397,6 +373,16 @@ if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 
'yes' ]]; then
 end_section Doxygen
 fi
 
+if [[ "${ASCIIDOC}" = 'yes' ]]; then
+start_section Asciidoc
+if runcmd make manpages; then
+hooray "make manpages has succeeded."
+else
+FAILED_TESTS="${FAILED_TESTS} asciidoc"
+fi
+end_section Asciidoc
+fi
+
 if [[ "${CHECK}" = "yes" ]]; then
 start_section "Check"
 if runcmd make "${make_options[@]}" check; then



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] CI: improve output when skipping doxygen

2020-08-12 Thread nickm

commit f5b94715479e9b7bef5675ab72c8b2e260bcb830
Author: Nick Mathewson 
Date:   Wed Aug 12 12:13:56 2020 -0400

CI: improve output when skipping doxygen
---
 scripts/ci/ci-driver.sh | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ba4b800c04..6faffd7b40 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -65,12 +65,14 @@ STEM_PATH="${STEM_PATH:-}"
 if [[ "${COLOR_CI}" == "yes" ]]; then
 T_RED=$(tput setaf 1 || true)
 T_GREEN=$(tput setaf 2 || true)
+T_YELLOW=$(tput setaf 3 || true)
 T_DIM=$(tput dim || true)
 T_BOLD=$(tput bold || true)
 T_RESET=$(tput sgr0 || true)
 else
 T_RED=
 T_GREEN=
+T_YELLOW=
 T_DIM=
 T_BOLD=
 T_RESET=
@@ -85,6 +87,12 @@ function die()
 echo "${T_BOLD}${T_RED}FATAL ERROR:${T_RESET} $*" 1>&2
 exit 1
 }
+
+function skipping()
+{
+echo "${T_BOLD}${T_YELLOW}Skipping $*${T_RESET}"
+}
+
 function hooray()
 {
 echo "${T_BOLD}${T_GREEN}$*${T_RESET}"
@@ -363,12 +371,16 @@ fi
 
 FAILED_TESTS=""
 
-if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if [[ "${DOXYGEN}" = 'yes' ]]; then
 start_section Doxygen
-if runcmd make doxygen; then
-   hooray "make doxygen has succeeded."
+if [[ "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if runcmd make doxygen; then
+   hooray "make doxygen has succeeded."
+else
+   FAILED_TESTS="${FAILED_TESTS} doxygen"
+fi
 else
-   FAILED_TESTS="${FAILED_TESTS} doxygen"
+skipping "make doxygen: doxygen is broken for Tor < 0.4.3"
 fi
 end_section Doxygen
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.3] CI: Try to enable integration tests, hardening, and clang.

2020-08-12 Thread nickm

commit fe0e62ddc40a59d4f138d53840a2919e9aac7b4d
Author: Nick Mathewson 
Date:   Wed Aug 12 09:38:19 2020 -0400

CI: Try to enable integration tests, hardening, and clang.
---
 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh |  3 +++
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abc5003678..3959bba024 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,7 @@ variables:
 - apt-get install
 automake
 build-essential
+ca-certificates
 git
 libevent-dev
 liblzma-dev
@@ -77,6 +78,10 @@ variables:
 zlib1g-dev
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
+- if [ "$STEM" = yes ]; then apt-get install timelimit; fi
+- if [ "$CC" = clang ]; then apt-get install clang; fi
+- if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+- if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
 debian-minimal:
   image: debian:stable
@@ -84,17 +89,18 @@ debian-minimal:
   script:
 - ./scripts/ci/ci-driver.sh
 
-###
-# Temporarily diabled. This one just takes too long to finish right now!
+
+# TODO: This one just takes too long to finish right now!
 # Maybe we need to divide the call to ./src/test/test into a few segments,
 # that all end in similar amount of time?
-#debian-hardened:
-#  image: debian:testing
-#  <<: *debian-template
-#  variables:
-#HARDENING: "yes"
-#  script:
-#- ./scripts/ci/ci-driver.sh
+debian-hardened:
+  image: debian:testing
+  <<: *debian-template
+  variables:
+HARDENING: "yes"
+CC: "clang"
+  script:
+- ./scripts/ci/ci-driver.sh
 
 debian-distcheck:
   image: debian:stable
@@ -115,3 +121,13 @@ debian-docs:
 CHECK: "no"
   script:
 - ./scripts/ci/ci-driver.sh
+
+debian-integration:
+  image: debian:stable
+  <<: *debian-template
+  variables:
+CHECK: "no"
+CHUTNEY: "yes"
+# STEM: "yes" -- currently failing on <044.
+  script:
+- ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ad08ee5af0..05c1415da0 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -411,10 +411,13 @@ fi
 
 if [[ "${CHUTNEY}" = "yes" ]]; then
 start_section "Chutney"
+export CHUTNEY_TOR_SANDBOX=0
+export CHUTNEY_ALLOW_FAILURES=2
 if runcmd make "${CHUTNEY_MAKE_TARGET}"; then
 hooray "Chutney tests have succeeded"
 else
 error "Chutney says:"
+export CHUTNEY_DATA_DIR="${CHUTNEY_PATH}/net"
 runcmd "${CHUTNEY_PATH}"/tools/diagnostics.sh || true
 #  These next two should be part of a make target.
 runcmd ls test_network_log || true



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4

2020-08-12 Thread nickm

commit 1b3c206cf3f88792d6a78fc50b263fc145f910ea
Merge: 16d5201af1 f98b1988ec
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.4.4' into release-0.4.4

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] CI: Try to enable integration tests, hardening, and clang.

2020-08-12 Thread nickm

commit fe0e62ddc40a59d4f138d53840a2919e9aac7b4d
Author: Nick Mathewson 
Date:   Wed Aug 12 09:38:19 2020 -0400

CI: Try to enable integration tests, hardening, and clang.
---
 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh |  3 +++
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abc5003678..3959bba024 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,7 @@ variables:
 - apt-get install
 automake
 build-essential
+ca-certificates
 git
 libevent-dev
 liblzma-dev
@@ -77,6 +78,10 @@ variables:
 zlib1g-dev
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
+- if [ "$STEM" = yes ]; then apt-get install timelimit; fi
+- if [ "$CC" = clang ]; then apt-get install clang; fi
+- if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+- if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
 debian-minimal:
   image: debian:stable
@@ -84,17 +89,18 @@ debian-minimal:
   script:
 - ./scripts/ci/ci-driver.sh
 
-###
-# Temporarily diabled. This one just takes too long to finish right now!
+
+# TODO: This one just takes too long to finish right now!
 # Maybe we need to divide the call to ./src/test/test into a few segments,
 # that all end in similar amount of time?
-#debian-hardened:
-#  image: debian:testing
-#  <<: *debian-template
-#  variables:
-#HARDENING: "yes"
-#  script:
-#- ./scripts/ci/ci-driver.sh
+debian-hardened:
+  image: debian:testing
+  <<: *debian-template
+  variables:
+HARDENING: "yes"
+CC: "clang"
+  script:
+- ./scripts/ci/ci-driver.sh
 
 debian-distcheck:
   image: debian:stable
@@ -115,3 +121,13 @@ debian-docs:
 CHECK: "no"
   script:
 - ./scripts/ci/ci-driver.sh
+
+debian-integration:
+  image: debian:stable
+  <<: *debian-template
+  variables:
+CHECK: "no"
+CHUTNEY: "yes"
+# STEM: "yes" -- currently failing on <044.
+  script:
+- ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ad08ee5af0..05c1415da0 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -411,10 +411,13 @@ fi
 
 if [[ "${CHUTNEY}" = "yes" ]]; then
 start_section "Chutney"
+export CHUTNEY_TOR_SANDBOX=0
+export CHUTNEY_ALLOW_FAILURES=2
 if runcmd make "${CHUTNEY_MAKE_TARGET}"; then
 hooray "Chutney tests have succeeded"
 else
 error "Chutney says:"
+export CHUTNEY_DATA_DIR="${CHUTNEY_PATH}/net"
 runcmd "${CHUTNEY_PATH}"/tools/diagnostics.sh || true
 #  These next two should be part of a make target.
 runcmd ls test_network_log || true



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.3] CI: improve output when skipping doxygen

2020-08-12 Thread nickm

commit f5b94715479e9b7bef5675ab72c8b2e260bcb830
Author: Nick Mathewson 
Date:   Wed Aug 12 12:13:56 2020 -0400

CI: improve output when skipping doxygen
---
 scripts/ci/ci-driver.sh | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ba4b800c04..6faffd7b40 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -65,12 +65,14 @@ STEM_PATH="${STEM_PATH:-}"
 if [[ "${COLOR_CI}" == "yes" ]]; then
 T_RED=$(tput setaf 1 || true)
 T_GREEN=$(tput setaf 2 || true)
+T_YELLOW=$(tput setaf 3 || true)
 T_DIM=$(tput dim || true)
 T_BOLD=$(tput bold || true)
 T_RESET=$(tput sgr0 || true)
 else
 T_RED=
 T_GREEN=
+T_YELLOW=
 T_DIM=
 T_BOLD=
 T_RESET=
@@ -85,6 +87,12 @@ function die()
 echo "${T_BOLD}${T_RED}FATAL ERROR:${T_RESET} $*" 1>&2
 exit 1
 }
+
+function skipping()
+{
+echo "${T_BOLD}${T_YELLOW}Skipping $*${T_RESET}"
+}
+
 function hooray()
 {
 echo "${T_BOLD}${T_GREEN}$*${T_RESET}"
@@ -363,12 +371,16 @@ fi
 
 FAILED_TESTS=""
 
-if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if [[ "${DOXYGEN}" = 'yes' ]]; then
 start_section Doxygen
-if runcmd make doxygen; then
-   hooray "make doxygen has succeeded."
+if [[ "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if runcmd make doxygen; then
+   hooray "make doxygen has succeeded."
+else
+   FAILED_TESTS="${FAILED_TESTS} doxygen"
+fi
 else
-   FAILED_TESTS="${FAILED_TESTS} doxygen"
+skipping "make doxygen: doxygen is broken for Tor < 0.4.3"
 fi
 end_section Doxygen
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] CI: Try to enable integration tests, hardening, and clang.

2020-08-12 Thread nickm

commit fe0e62ddc40a59d4f138d53840a2919e9aac7b4d
Author: Nick Mathewson 
Date:   Wed Aug 12 09:38:19 2020 -0400

CI: Try to enable integration tests, hardening, and clang.
---
 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh |  3 +++
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abc5003678..3959bba024 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,7 @@ variables:
 - apt-get install
 automake
 build-essential
+ca-certificates
 git
 libevent-dev
 liblzma-dev
@@ -77,6 +78,10 @@ variables:
 zlib1g-dev
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
+- if [ "$STEM" = yes ]; then apt-get install timelimit; fi
+- if [ "$CC" = clang ]; then apt-get install clang; fi
+- if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+- if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
 debian-minimal:
   image: debian:stable
@@ -84,17 +89,18 @@ debian-minimal:
   script:
 - ./scripts/ci/ci-driver.sh
 
-###
-# Temporarily diabled. This one just takes too long to finish right now!
+
+# TODO: This one just takes too long to finish right now!
 # Maybe we need to divide the call to ./src/test/test into a few segments,
 # that all end in similar amount of time?
-#debian-hardened:
-#  image: debian:testing
-#  <<: *debian-template
-#  variables:
-#HARDENING: "yes"
-#  script:
-#- ./scripts/ci/ci-driver.sh
+debian-hardened:
+  image: debian:testing
+  <<: *debian-template
+  variables:
+HARDENING: "yes"
+CC: "clang"
+  script:
+- ./scripts/ci/ci-driver.sh
 
 debian-distcheck:
   image: debian:stable
@@ -115,3 +121,13 @@ debian-docs:
 CHECK: "no"
   script:
 - ./scripts/ci/ci-driver.sh
+
+debian-integration:
+  image: debian:stable
+  <<: *debian-template
+  variables:
+CHECK: "no"
+CHUTNEY: "yes"
+# STEM: "yes" -- currently failing on <044.
+  script:
+- ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ad08ee5af0..05c1415da0 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -411,10 +411,13 @@ fi
 
 if [[ "${CHUTNEY}" = "yes" ]]; then
 start_section "Chutney"
+export CHUTNEY_TOR_SANDBOX=0
+export CHUTNEY_ALLOW_FAILURES=2
 if runcmd make "${CHUTNEY_MAKE_TARGET}"; then
 hooray "Chutney tests have succeeded"
 else
 error "Chutney says:"
+export CHUTNEY_DATA_DIR="${CHUTNEY_PATH}/net"
 runcmd "${CHUTNEY_PATH}"/tools/diagnostics.sh || true
 #  These next two should be part of a make target.
 runcmd ls test_network_log || true



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.3] Try disabling "make all" when checking docs.

2020-08-12 Thread nickm

commit 50b7bd243fdea1ae1ab3ee0c3304d9d39246581c
Author: Nick Mathewson 
Date:   Wed Aug 12 11:35:15 2020 -0400

Try disabling "make all" when checking docs.
---
 .gitlab-ci.yml  |  2 +-
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 54 ++---
 3 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3959bba024..8ed615687b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,7 +111,6 @@ debian-distcheck:
   script:
 - ./scripts/ci/ci-driver.sh
 
-# TODO: it would be neat to disable the "make all" part of this one.
 debian-docs:
   image: debian:stable
   <<: *debian-template
@@ -119,6 +118,7 @@ debian-docs:
 DOXYGEN: "yes"
 ASCIIDOC: "yes"
 CHECK: "no"
+RUN_STAGE_BUILD: "no"
   script:
 - ./scripts/ci/ci-driver.sh
 
diff --git a/Makefile.am b/Makefile.am
index 5d18666edc..a868be7362 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,6 +149,8 @@ include src/include.am
 include doc/include.am
 include contrib/include.am
 
+manpages: $(nodist_man1_MANS)
+
 EXTRA_DIST+= \
ChangeLog   \
CONTRIBUTING\
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 05c1415da0..ba4b800c04 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -21,6 +21,11 @@ COLOR_CI="${COLOR_CI:-yes}"
 # Options for which CI system this is.
 ON_GITLAB="${ON_GITLAB:-yes}"
 
+# Options for things we usually won't want to skip.
+RUN_STAGE_CONFIGURE="${RUN_STAGE_CONFIGURE:-yes}"
+RUN_STAGE_BUILD="${RUN_STAGE_BUILD:-yes}"
+RUN_STAGE_TEST="${RUN_STAGE_TEST:-yes}"
+
 # Options for how to build Tor.  All should be yes/no.
 FATAL_WARNINGS="${FATAL_WARNINGS:-yes}"
 HARDENING="${HARDENING:-no}"
@@ -165,33 +170,6 @@ else
 }
 fi
 
-if [[ "$*" == "" ]]; then
-RUN_STAGE_CONFIGURE="yes"
-RUN_STAGE_BUILD="yes"
-RUN_STAGE_TEST="yes"
-else
-RUN_STAGE_CONFIGURE="no"
-RUN_STAGE_BUILD="no"
-RUN_STAGE_TEST="no"
-
-for stage in "$@"; do
-   case "$stage" in
-   configure)
-   RUN_STAGE_CONFIGURE="yes"
-   ;;
-   build)
-   RUN_STAGE_BUILD="yes"
-   ;;
-   test)
-   RUN_STAGE_TEST="yes"
-   ;;
-   *)
-   error "Unknown stage $stage"
-   ;;
-   esac
-done
-fi
-
 #
 # Validate inputs.
 
@@ -206,6 +184,10 @@ yes_or_no RUST
 yes_or_no DOXYGEN
 yes_or_no ASCIIDOC
 
+yes_or_no RUN_STAGE_CONFIGURE
+yes_or_no RUN_STAGE_BUILD
+yes_or_no RUN_STAGE_TEST
+
 yes_or_no CHECK
 yes_or_no STEM
 yes_or_no DISTCHECK
@@ -370,6 +352,7 @@ if [[ "$RUN_STAGE_BUILD" = "yes" ]] ; then
end_section Distcheck
 fi
 fi
+
 ##
 # Run tests.
 
@@ -378,13 +361,6 @@ if [[ "$RUN_STAGE_TEST" == "no" ]]; then
 exit 0
 fi
 
-if [[ "$RUN_STAGE_BUILD" = "no" ]] ; then
-debug "Skipped build stage. Making sure that ./src/app/tor exists."
-if [[ ! -f "./src/app/tor" ]]; then
-   die "$(pwd)/src/app/tor does not exist"
-fi
-fi
-
 FAILED_TESTS=""
 
 if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
@@ -397,6 +373,16 @@ if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 
'yes' ]]; then
 end_section Doxygen
 fi
 
+if [[ "${ASCIIDOC}" = 'yes' ]]; then
+start_section Asciidoc
+if runcmd make manpages; then
+hooray "make manpages has succeeded."
+else
+FAILED_TESTS="${FAILED_TESTS} asciidoc"
+fi
+end_section Asciidoc
+fi
+
 if [[ "${CHECK}" = "yes" ]]; then
 start_section "Check"
 if runcmd make "${make_options[@]}" check; then



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-08-12 Thread nickm

commit 02bb719a9494a010b3cad4cf81942ec7619f5806
Merge: 6ef40144ae f5b9471547
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Try disabling "make all" when checking docs.

2020-08-12 Thread nickm

commit 50b7bd243fdea1ae1ab3ee0c3304d9d39246581c
Author: Nick Mathewson 
Date:   Wed Aug 12 11:35:15 2020 -0400

Try disabling "make all" when checking docs.
---
 .gitlab-ci.yml  |  2 +-
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 54 ++---
 3 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3959bba024..8ed615687b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,7 +111,6 @@ debian-distcheck:
   script:
 - ./scripts/ci/ci-driver.sh
 
-# TODO: it would be neat to disable the "make all" part of this one.
 debian-docs:
   image: debian:stable
   <<: *debian-template
@@ -119,6 +118,7 @@ debian-docs:
 DOXYGEN: "yes"
 ASCIIDOC: "yes"
 CHECK: "no"
+RUN_STAGE_BUILD: "no"
   script:
 - ./scripts/ci/ci-driver.sh
 
diff --git a/Makefile.am b/Makefile.am
index 5d18666edc..a868be7362 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,6 +149,8 @@ include src/include.am
 include doc/include.am
 include contrib/include.am
 
+manpages: $(nodist_man1_MANS)
+
 EXTRA_DIST+= \
ChangeLog   \
CONTRIBUTING\
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 05c1415da0..ba4b800c04 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -21,6 +21,11 @@ COLOR_CI="${COLOR_CI:-yes}"
 # Options for which CI system this is.
 ON_GITLAB="${ON_GITLAB:-yes}"
 
+# Options for things we usually won't want to skip.
+RUN_STAGE_CONFIGURE="${RUN_STAGE_CONFIGURE:-yes}"
+RUN_STAGE_BUILD="${RUN_STAGE_BUILD:-yes}"
+RUN_STAGE_TEST="${RUN_STAGE_TEST:-yes}"
+
 # Options for how to build Tor.  All should be yes/no.
 FATAL_WARNINGS="${FATAL_WARNINGS:-yes}"
 HARDENING="${HARDENING:-no}"
@@ -165,33 +170,6 @@ else
 }
 fi
 
-if [[ "$*" == "" ]]; then
-RUN_STAGE_CONFIGURE="yes"
-RUN_STAGE_BUILD="yes"
-RUN_STAGE_TEST="yes"
-else
-RUN_STAGE_CONFIGURE="no"
-RUN_STAGE_BUILD="no"
-RUN_STAGE_TEST="no"
-
-for stage in "$@"; do
-   case "$stage" in
-   configure)
-   RUN_STAGE_CONFIGURE="yes"
-   ;;
-   build)
-   RUN_STAGE_BUILD="yes"
-   ;;
-   test)
-   RUN_STAGE_TEST="yes"
-   ;;
-   *)
-   error "Unknown stage $stage"
-   ;;
-   esac
-done
-fi
-
 #
 # Validate inputs.
 
@@ -206,6 +184,10 @@ yes_or_no RUST
 yes_or_no DOXYGEN
 yes_or_no ASCIIDOC
 
+yes_or_no RUN_STAGE_CONFIGURE
+yes_or_no RUN_STAGE_BUILD
+yes_or_no RUN_STAGE_TEST
+
 yes_or_no CHECK
 yes_or_no STEM
 yes_or_no DISTCHECK
@@ -370,6 +352,7 @@ if [[ "$RUN_STAGE_BUILD" = "yes" ]] ; then
end_section Distcheck
 fi
 fi
+
 ##
 # Run tests.
 
@@ -378,13 +361,6 @@ if [[ "$RUN_STAGE_TEST" == "no" ]]; then
 exit 0
 fi
 
-if [[ "$RUN_STAGE_BUILD" = "no" ]] ; then
-debug "Skipped build stage. Making sure that ./src/app/tor exists."
-if [[ ! -f "./src/app/tor" ]]; then
-   die "$(pwd)/src/app/tor does not exist"
-fi
-fi
-
 FAILED_TESTS=""
 
 if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
@@ -397,6 +373,16 @@ if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 
'yes' ]]; then
 end_section Doxygen
 fi
 
+if [[ "${ASCIIDOC}" = 'yes' ]]; then
+start_section Asciidoc
+if runcmd make manpages; then
+hooray "make manpages has succeeded."
+else
+FAILED_TESTS="${FAILED_TESTS} asciidoc"
+fi
+end_section Asciidoc
+fi
+
 if [[ "${CHECK}" = "yes" ]]; then
 start_section "Check"
 if runcmd make "${make_options[@]}" check; then



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-08-12 Thread nickm

commit 309eafbc3c0064a670f5f4b11c3639f7ade6229b
Merge: 489d33e190 02bb719a94
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)

diff --cc Makefile.am
index 3b30c01f00,f6346fe0fc..1041494da7
--- a/Makefile.am
+++ b/Makefile.am
@@@ -162,53 -157,40 +162,55 @@@ include src/include.a
  include doc/include.am
  include contrib/include.am
  
+ manpages: $(nodist_man1_MANS)
+ 
  EXTRA_DIST+= \
 -  ChangeLog   \
 -  CONTRIBUTING\
 -  CODE_OF_CONDUCT \
 -  INSTALL \
 -  LICENSE \
 -  Makefile.nmake  \
 -  README  \
 -  ReleaseNotes\
 -  scripts/maint/checkIncludes.py  \
 -  scripts/maint/checkSpace.pl \
 -  scripts/maint/checkShellScripts.sh  \
 -  scripts/maint/practracker/README\
 -  scripts/maint/practracker/exceptions.txt\
 -  scripts/maint/practracker/includes.py   \
 -  scripts/maint/practracker/metrics.py\
 -  scripts/maint/practracker/practracker.py\
 -  scripts/maint/practracker/practracker_tests.py  \
 -  scripts/maint/practracker/problem.py\
 -  scripts/maint/practracker/testdata/.may_include \
 -  scripts/maint/practracker/testdata/a.c  \
 -  scripts/maint/practracker/testdata/b.c  \
 -  scripts/maint/practracker/testdata/ex0-expected.txt \
 -  scripts/maint/practracker/testdata/ex0.txt  \
 -  scripts/maint/practracker/testdata/ex1-expected.txt \
 -  scripts/maint/practracker/testdata/ex1.txt  \
 -  scripts/maint/practracker/testdata/ex1-overbroad-expected.txt   \
 -  scripts/maint/practracker/testdata/ex.txt   \
 -  scripts/maint/practracker/testdata/header.h \
 -  scripts/maint/practracker/testdata/not_c_file   \
 -  scripts/maint/practracker/test_practracker.sh   \
 -  scripts/maint/practracker/util.py
 +  ChangeLog   \
 +  CONTRIBUTING\
 +  CODE_OF_CONDUCT \
 +  INSTALL \
 +  LICENSE \
 +  Makefile.nmake  \
 +  README  \
 +  ReleaseNotes\
 +  scripts/maint/checkIncludes.py  \
 +  scripts/maint/checkSpace.pl \
 +  scripts/maint/checkSpaceTest.sh \
 +  scripts/maint/checkspace_tests/dubious.c\
 +  scripts/maint/checkspace_tests/dubious.h\
 +  scripts/maint/checkspace_tests/expected.txt \
 +  scripts/maint/checkspace_tests/good_guard.h \
 +  scripts/maint/checkspace_tests/same_guard.h \
 +  scripts/maint/checkspace_tests/subdir/dubious.c \
 +  scripts/maint/checkShellScripts.sh  \
 +  scripts/maint/practracker/README\
 +  scripts/maint/practracker/exceptions.txt\
 +  scripts/maint/practracker/includes.py   \
 +  scripts/maint/practracker/metrics.py\
 +  scripts/maint/practracker/practracker.py\
 +  scripts/maint/practracker/practracker_tests.py  \
 +  scripts/maint/practracker/problem.py\
 +  scripts/maint/practracker/testdata/.may_include \
 +  scripts/maint/practracker/testdata/a.c  \
 +  scripts/maint/practracker/testdata/b.c  \
 +  scripts/maint/practracker/testdata/ex0-expected.txt \
 +  scripts/maint/practracker/testdata/ex0.txt  \
 +  scripts/maint/practracker/testdata/ex1-expected.txt \
 +  scripts/maint/practracker/testdata/ex1.txt  \
 +  scripts/maint/practracker/testdata/ex1-overbroad-expected.txt   \
 +  scripts/maint/practracker/testdata/ex1-regen-expected.txt

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-08-12 Thread nickm

commit 02bb719a9494a010b3cad4cf81942ec7619f5806
Merge: 6ef40144ae f5b9471547
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-08-12 Thread nickm

commit f98b1988ec5ca1eb3d2923faf43c1df7541efafb
Merge: 670f5632a5 309eafbc3c
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.4.3' into maint-0.4.4

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-08-12 Thread nickm

commit 309eafbc3c0064a670f5f4b11c3639f7ade6229b
Merge: 489d33e190 02bb719a94
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)

diff --cc Makefile.am
index 3b30c01f00,f6346fe0fc..1041494da7
--- a/Makefile.am
+++ b/Makefile.am
@@@ -162,53 -157,40 +162,55 @@@ include src/include.a
  include doc/include.am
  include contrib/include.am
  
+ manpages: $(nodist_man1_MANS)
+ 
  EXTRA_DIST+= \
 -  ChangeLog   \
 -  CONTRIBUTING\
 -  CODE_OF_CONDUCT \
 -  INSTALL \
 -  LICENSE \
 -  Makefile.nmake  \
 -  README  \
 -  ReleaseNotes\
 -  scripts/maint/checkIncludes.py  \
 -  scripts/maint/checkSpace.pl \
 -  scripts/maint/checkShellScripts.sh  \
 -  scripts/maint/practracker/README\
 -  scripts/maint/practracker/exceptions.txt\
 -  scripts/maint/practracker/includes.py   \
 -  scripts/maint/practracker/metrics.py\
 -  scripts/maint/practracker/practracker.py\
 -  scripts/maint/practracker/practracker_tests.py  \
 -  scripts/maint/practracker/problem.py\
 -  scripts/maint/practracker/testdata/.may_include \
 -  scripts/maint/practracker/testdata/a.c  \
 -  scripts/maint/practracker/testdata/b.c  \
 -  scripts/maint/practracker/testdata/ex0-expected.txt \
 -  scripts/maint/practracker/testdata/ex0.txt  \
 -  scripts/maint/practracker/testdata/ex1-expected.txt \
 -  scripts/maint/practracker/testdata/ex1.txt  \
 -  scripts/maint/practracker/testdata/ex1-overbroad-expected.txt   \
 -  scripts/maint/practracker/testdata/ex.txt   \
 -  scripts/maint/practracker/testdata/header.h \
 -  scripts/maint/practracker/testdata/not_c_file   \
 -  scripts/maint/practracker/test_practracker.sh   \
 -  scripts/maint/practracker/util.py
 +  ChangeLog   \
 +  CONTRIBUTING\
 +  CODE_OF_CONDUCT \
 +  INSTALL \
 +  LICENSE \
 +  Makefile.nmake  \
 +  README  \
 +  ReleaseNotes\
 +  scripts/maint/checkIncludes.py  \
 +  scripts/maint/checkSpace.pl \
 +  scripts/maint/checkSpaceTest.sh \
 +  scripts/maint/checkspace_tests/dubious.c\
 +  scripts/maint/checkspace_tests/dubious.h\
 +  scripts/maint/checkspace_tests/expected.txt \
 +  scripts/maint/checkspace_tests/good_guard.h \
 +  scripts/maint/checkspace_tests/same_guard.h \
 +  scripts/maint/checkspace_tests/subdir/dubious.c \
 +  scripts/maint/checkShellScripts.sh  \
 +  scripts/maint/practracker/README\
 +  scripts/maint/practracker/exceptions.txt\
 +  scripts/maint/practracker/includes.py   \
 +  scripts/maint/practracker/metrics.py\
 +  scripts/maint/practracker/practracker.py\
 +  scripts/maint/practracker/practracker_tests.py  \
 +  scripts/maint/practracker/problem.py\
 +  scripts/maint/practracker/testdata/.may_include \
 +  scripts/maint/practracker/testdata/a.c  \
 +  scripts/maint/practracker/testdata/b.c  \
 +  scripts/maint/practracker/testdata/ex0-expected.txt \
 +  scripts/maint/practracker/testdata/ex0.txt  \
 +  scripts/maint/practracker/testdata/ex1-expected.txt \
 +  scripts/maint/practracker/testdata/ex1.txt  \
 +  scripts/maint/practracker/testdata/ex1-overbroad-expected.txt   \
 +  scripts/maint/practracker/testdata/ex1-regen-expected.txt

[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

2020-08-12 Thread nickm

commit b6fb925e99945b40573a96e469117ed2bf9e884f
Merge: 6753b804e4 02bb719a94
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.4.2' into release-0.4.2

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-08-12 Thread nickm

commit 02bb719a9494a010b3cad4cf81942ec7619f5806
Merge: 6ef40144ae f5b9471547
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] CI: Try to enable integration tests, hardening, and clang.

2020-08-12 Thread nickm

commit fe0e62ddc40a59d4f138d53840a2919e9aac7b4d
Author: Nick Mathewson 
Date:   Wed Aug 12 09:38:19 2020 -0400

CI: Try to enable integration tests, hardening, and clang.
---
 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh |  3 +++
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abc5003678..3959bba024 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,7 @@ variables:
 - apt-get install
 automake
 build-essential
+ca-certificates
 git
 libevent-dev
 liblzma-dev
@@ -77,6 +78,10 @@ variables:
 zlib1g-dev
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
+- if [ "$STEM" = yes ]; then apt-get install timelimit; fi
+- if [ "$CC" = clang ]; then apt-get install clang; fi
+- if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+- if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
 debian-minimal:
   image: debian:stable
@@ -84,17 +89,18 @@ debian-minimal:
   script:
 - ./scripts/ci/ci-driver.sh
 
-###
-# Temporarily diabled. This one just takes too long to finish right now!
+
+# TODO: This one just takes too long to finish right now!
 # Maybe we need to divide the call to ./src/test/test into a few segments,
 # that all end in similar amount of time?
-#debian-hardened:
-#  image: debian:testing
-#  <<: *debian-template
-#  variables:
-#HARDENING: "yes"
-#  script:
-#- ./scripts/ci/ci-driver.sh
+debian-hardened:
+  image: debian:testing
+  <<: *debian-template
+  variables:
+HARDENING: "yes"
+CC: "clang"
+  script:
+- ./scripts/ci/ci-driver.sh
 
 debian-distcheck:
   image: debian:stable
@@ -115,3 +121,13 @@ debian-docs:
 CHECK: "no"
   script:
 - ./scripts/ci/ci-driver.sh
+
+debian-integration:
+  image: debian:stable
+  <<: *debian-template
+  variables:
+CHECK: "no"
+CHUTNEY: "yes"
+# STEM: "yes" -- currently failing on <044.
+  script:
+- ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ad08ee5af0..05c1415da0 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -411,10 +411,13 @@ fi
 
 if [[ "${CHUTNEY}" = "yes" ]]; then
 start_section "Chutney"
+export CHUTNEY_TOR_SANDBOX=0
+export CHUTNEY_ALLOW_FAILURES=2
 if runcmd make "${CHUTNEY_MAKE_TARGET}"; then
 hooray "Chutney tests have succeeded"
 else
 error "Chutney says:"
+export CHUTNEY_DATA_DIR="${CHUTNEY_PATH}/net"
 runcmd "${CHUTNEY_PATH}"/tools/diagnostics.sh || true
 #  These next two should be part of a make target.
 runcmd ls test_network_log || true



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-08-12 Thread nickm

commit 309eafbc3c0064a670f5f4b11c3639f7ade6229b
Merge: 489d33e190 02bb719a94
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)

diff --cc Makefile.am
index 3b30c01f00,f6346fe0fc..1041494da7
--- a/Makefile.am
+++ b/Makefile.am
@@@ -162,53 -157,40 +162,55 @@@ include src/include.a
  include doc/include.am
  include contrib/include.am
  
+ manpages: $(nodist_man1_MANS)
+ 
  EXTRA_DIST+= \
 -  ChangeLog   \
 -  CONTRIBUTING\
 -  CODE_OF_CONDUCT \
 -  INSTALL \
 -  LICENSE \
 -  Makefile.nmake  \
 -  README  \
 -  ReleaseNotes\
 -  scripts/maint/checkIncludes.py  \
 -  scripts/maint/checkSpace.pl \
 -  scripts/maint/checkShellScripts.sh  \
 -  scripts/maint/practracker/README\
 -  scripts/maint/practracker/exceptions.txt\
 -  scripts/maint/practracker/includes.py   \
 -  scripts/maint/practracker/metrics.py\
 -  scripts/maint/practracker/practracker.py\
 -  scripts/maint/practracker/practracker_tests.py  \
 -  scripts/maint/practracker/problem.py\
 -  scripts/maint/practracker/testdata/.may_include \
 -  scripts/maint/practracker/testdata/a.c  \
 -  scripts/maint/practracker/testdata/b.c  \
 -  scripts/maint/practracker/testdata/ex0-expected.txt \
 -  scripts/maint/practracker/testdata/ex0.txt  \
 -  scripts/maint/practracker/testdata/ex1-expected.txt \
 -  scripts/maint/practracker/testdata/ex1.txt  \
 -  scripts/maint/practracker/testdata/ex1-overbroad-expected.txt   \
 -  scripts/maint/practracker/testdata/ex.txt   \
 -  scripts/maint/practracker/testdata/header.h \
 -  scripts/maint/practracker/testdata/not_c_file   \
 -  scripts/maint/practracker/test_practracker.sh   \
 -  scripts/maint/practracker/util.py
 +  ChangeLog   \
 +  CONTRIBUTING\
 +  CODE_OF_CONDUCT \
 +  INSTALL \
 +  LICENSE \
 +  Makefile.nmake  \
 +  README  \
 +  ReleaseNotes\
 +  scripts/maint/checkIncludes.py  \
 +  scripts/maint/checkSpace.pl \
 +  scripts/maint/checkSpaceTest.sh \
 +  scripts/maint/checkspace_tests/dubious.c\
 +  scripts/maint/checkspace_tests/dubious.h\
 +  scripts/maint/checkspace_tests/expected.txt \
 +  scripts/maint/checkspace_tests/good_guard.h \
 +  scripts/maint/checkspace_tests/same_guard.h \
 +  scripts/maint/checkspace_tests/subdir/dubious.c \
 +  scripts/maint/checkShellScripts.sh  \
 +  scripts/maint/practracker/README\
 +  scripts/maint/practracker/exceptions.txt\
 +  scripts/maint/practracker/includes.py   \
 +  scripts/maint/practracker/metrics.py\
 +  scripts/maint/practracker/practracker.py\
 +  scripts/maint/practracker/practracker_tests.py  \
 +  scripts/maint/practracker/problem.py\
 +  scripts/maint/practracker/testdata/.may_include \
 +  scripts/maint/practracker/testdata/a.c  \
 +  scripts/maint/practracker/testdata/b.c  \
 +  scripts/maint/practracker/testdata/ex0-expected.txt \
 +  scripts/maint/practracker/testdata/ex0.txt  \
 +  scripts/maint/practracker/testdata/ex1-expected.txt \
 +  scripts/maint/practracker/testdata/ex1.txt  \
 +  scripts/maint/practracker/testdata/ex1-overbroad-expected.txt   \
 +  scripts/maint/practracker/testdata/ex1-regen-expected.txt

[tor-commits] [tor/master] Merge branch 'maint-0.4.4'

2020-08-12 Thread nickm

commit 11f1fe3aca08c19ab07d9380c1bd47678c99abc4
Merge: 06c31b1b79 f98b1988ec
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.4.4'

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.2] CI: improve output when skipping doxygen

2020-08-12 Thread nickm

commit f5b94715479e9b7bef5675ab72c8b2e260bcb830
Author: Nick Mathewson 
Date:   Wed Aug 12 12:13:56 2020 -0400

CI: improve output when skipping doxygen
---
 scripts/ci/ci-driver.sh | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ba4b800c04..6faffd7b40 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -65,12 +65,14 @@ STEM_PATH="${STEM_PATH:-}"
 if [[ "${COLOR_CI}" == "yes" ]]; then
 T_RED=$(tput setaf 1 || true)
 T_GREEN=$(tput setaf 2 || true)
+T_YELLOW=$(tput setaf 3 || true)
 T_DIM=$(tput dim || true)
 T_BOLD=$(tput bold || true)
 T_RESET=$(tput sgr0 || true)
 else
 T_RED=
 T_GREEN=
+T_YELLOW=
 T_DIM=
 T_BOLD=
 T_RESET=
@@ -85,6 +87,12 @@ function die()
 echo "${T_BOLD}${T_RED}FATAL ERROR:${T_RESET} $*" 1>&2
 exit 1
 }
+
+function skipping()
+{
+echo "${T_BOLD}${T_YELLOW}Skipping $*${T_RESET}"
+}
+
 function hooray()
 {
 echo "${T_BOLD}${T_GREEN}$*${T_RESET}"
@@ -363,12 +371,16 @@ fi
 
 FAILED_TESTS=""
 
-if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if [[ "${DOXYGEN}" = 'yes' ]]; then
 start_section Doxygen
-if runcmd make doxygen; then
-   hooray "make doxygen has succeeded."
+if [[ "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if runcmd make doxygen; then
+   hooray "make doxygen has succeeded."
+else
+   FAILED_TESTS="${FAILED_TESTS} doxygen"
+fi
 else
-   FAILED_TESTS="${FAILED_TESTS} doxygen"
+skipping "make doxygen: doxygen is broken for Tor < 0.4.3"
 fi
 end_section Doxygen
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.2] Try disabling "make all" when checking docs.

2020-08-12 Thread nickm

commit 50b7bd243fdea1ae1ab3ee0c3304d9d39246581c
Author: Nick Mathewson 
Date:   Wed Aug 12 11:35:15 2020 -0400

Try disabling "make all" when checking docs.
---
 .gitlab-ci.yml  |  2 +-
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 54 ++---
 3 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3959bba024..8ed615687b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,7 +111,6 @@ debian-distcheck:
   script:
 - ./scripts/ci/ci-driver.sh
 
-# TODO: it would be neat to disable the "make all" part of this one.
 debian-docs:
   image: debian:stable
   <<: *debian-template
@@ -119,6 +118,7 @@ debian-docs:
 DOXYGEN: "yes"
 ASCIIDOC: "yes"
 CHECK: "no"
+RUN_STAGE_BUILD: "no"
   script:
 - ./scripts/ci/ci-driver.sh
 
diff --git a/Makefile.am b/Makefile.am
index 5d18666edc..a868be7362 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,6 +149,8 @@ include src/include.am
 include doc/include.am
 include contrib/include.am
 
+manpages: $(nodist_man1_MANS)
+
 EXTRA_DIST+= \
ChangeLog   \
CONTRIBUTING\
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 05c1415da0..ba4b800c04 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -21,6 +21,11 @@ COLOR_CI="${COLOR_CI:-yes}"
 # Options for which CI system this is.
 ON_GITLAB="${ON_GITLAB:-yes}"
 
+# Options for things we usually won't want to skip.
+RUN_STAGE_CONFIGURE="${RUN_STAGE_CONFIGURE:-yes}"
+RUN_STAGE_BUILD="${RUN_STAGE_BUILD:-yes}"
+RUN_STAGE_TEST="${RUN_STAGE_TEST:-yes}"
+
 # Options for how to build Tor.  All should be yes/no.
 FATAL_WARNINGS="${FATAL_WARNINGS:-yes}"
 HARDENING="${HARDENING:-no}"
@@ -165,33 +170,6 @@ else
 }
 fi
 
-if [[ "$*" == "" ]]; then
-RUN_STAGE_CONFIGURE="yes"
-RUN_STAGE_BUILD="yes"
-RUN_STAGE_TEST="yes"
-else
-RUN_STAGE_CONFIGURE="no"
-RUN_STAGE_BUILD="no"
-RUN_STAGE_TEST="no"
-
-for stage in "$@"; do
-   case "$stage" in
-   configure)
-   RUN_STAGE_CONFIGURE="yes"
-   ;;
-   build)
-   RUN_STAGE_BUILD="yes"
-   ;;
-   test)
-   RUN_STAGE_TEST="yes"
-   ;;
-   *)
-   error "Unknown stage $stage"
-   ;;
-   esac
-done
-fi
-
 #
 # Validate inputs.
 
@@ -206,6 +184,10 @@ yes_or_no RUST
 yes_or_no DOXYGEN
 yes_or_no ASCIIDOC
 
+yes_or_no RUN_STAGE_CONFIGURE
+yes_or_no RUN_STAGE_BUILD
+yes_or_no RUN_STAGE_TEST
+
 yes_or_no CHECK
 yes_or_no STEM
 yes_or_no DISTCHECK
@@ -370,6 +352,7 @@ if [[ "$RUN_STAGE_BUILD" = "yes" ]] ; then
end_section Distcheck
 fi
 fi
+
 ##
 # Run tests.
 
@@ -378,13 +361,6 @@ if [[ "$RUN_STAGE_TEST" == "no" ]]; then
 exit 0
 fi
 
-if [[ "$RUN_STAGE_BUILD" = "no" ]] ; then
-debug "Skipped build stage. Making sure that ./src/app/tor exists."
-if [[ ! -f "./src/app/tor" ]]; then
-   die "$(pwd)/src/app/tor does not exist"
-fi
-fi
-
 FAILED_TESTS=""
 
 if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
@@ -397,6 +373,16 @@ if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 
'yes' ]]; then
 end_section Doxygen
 fi
 
+if [[ "${ASCIIDOC}" = 'yes' ]]; then
+start_section Asciidoc
+if runcmd make manpages; then
+hooray "make manpages has succeeded."
+else
+FAILED_TESTS="${FAILED_TESTS} asciidoc"
+fi
+end_section Asciidoc
+fi
+
 if [[ "${CHECK}" = "yes" ]]; then
 start_section "Check"
 if runcmd make "${make_options[@]}" check; then



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5

2020-08-12 Thread nickm

commit ac5a06d42c0eed5686d7d63efc2610a8b2420a14
Merge: 607325122f f5b9471547
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.4.2] CI: Try to enable integration tests, hardening, and clang.

2020-08-12 Thread nickm

commit fe0e62ddc40a59d4f138d53840a2919e9aac7b4d
Author: Nick Mathewson 
Date:   Wed Aug 12 09:38:19 2020 -0400

CI: Try to enable integration tests, hardening, and clang.
---
 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh |  3 +++
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abc5003678..3959bba024 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,7 @@ variables:
 - apt-get install
 automake
 build-essential
+ca-certificates
 git
 libevent-dev
 liblzma-dev
@@ -77,6 +78,10 @@ variables:
 zlib1g-dev
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
+- if [ "$STEM" = yes ]; then apt-get install timelimit; fi
+- if [ "$CC" = clang ]; then apt-get install clang; fi
+- if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+- if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
 debian-minimal:
   image: debian:stable
@@ -84,17 +89,18 @@ debian-minimal:
   script:
 - ./scripts/ci/ci-driver.sh
 
-###
-# Temporarily diabled. This one just takes too long to finish right now!
+
+# TODO: This one just takes too long to finish right now!
 # Maybe we need to divide the call to ./src/test/test into a few segments,
 # that all end in similar amount of time?
-#debian-hardened:
-#  image: debian:testing
-#  <<: *debian-template
-#  variables:
-#HARDENING: "yes"
-#  script:
-#- ./scripts/ci/ci-driver.sh
+debian-hardened:
+  image: debian:testing
+  <<: *debian-template
+  variables:
+HARDENING: "yes"
+CC: "clang"
+  script:
+- ./scripts/ci/ci-driver.sh
 
 debian-distcheck:
   image: debian:stable
@@ -115,3 +121,13 @@ debian-docs:
 CHECK: "no"
   script:
 - ./scripts/ci/ci-driver.sh
+
+debian-integration:
+  image: debian:stable
+  <<: *debian-template
+  variables:
+CHECK: "no"
+CHUTNEY: "yes"
+# STEM: "yes" -- currently failing on <044.
+  script:
+- ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ad08ee5af0..05c1415da0 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -411,10 +411,13 @@ fi
 
 if [[ "${CHUTNEY}" = "yes" ]]; then
 start_section "Chutney"
+export CHUTNEY_TOR_SANDBOX=0
+export CHUTNEY_ALLOW_FAILURES=2
 if runcmd make "${CHUTNEY_MAKE_TARGET}"; then
 hooray "Chutney tests have succeeded"
 else
 error "Chutney says:"
+export CHUTNEY_DATA_DIR="${CHUTNEY_PATH}/net"
 runcmd "${CHUTNEY_PATH}"/tools/diagnostics.sh || true
 #  These next two should be part of a make target.
 runcmd ls test_network_log || true



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-08-12 Thread nickm

commit 02bb719a9494a010b3cad4cf81942ec7619f5806
Merge: 6ef40144ae f5b9471547
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-08-12 Thread nickm

commit 309eafbc3c0064a670f5f4b11c3639f7ade6229b
Merge: 489d33e190 02bb719a94
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)

diff --cc Makefile.am
index 3b30c01f00,f6346fe0fc..1041494da7
--- a/Makefile.am
+++ b/Makefile.am
@@@ -162,53 -157,40 +162,55 @@@ include src/include.a
  include doc/include.am
  include contrib/include.am
  
+ manpages: $(nodist_man1_MANS)
+ 
  EXTRA_DIST+= \
 -  ChangeLog   \
 -  CONTRIBUTING\
 -  CODE_OF_CONDUCT \
 -  INSTALL \
 -  LICENSE \
 -  Makefile.nmake  \
 -  README  \
 -  ReleaseNotes\
 -  scripts/maint/checkIncludes.py  \
 -  scripts/maint/checkSpace.pl \
 -  scripts/maint/checkShellScripts.sh  \
 -  scripts/maint/practracker/README\
 -  scripts/maint/practracker/exceptions.txt\
 -  scripts/maint/practracker/includes.py   \
 -  scripts/maint/practracker/metrics.py\
 -  scripts/maint/practracker/practracker.py\
 -  scripts/maint/practracker/practracker_tests.py  \
 -  scripts/maint/practracker/problem.py\
 -  scripts/maint/practracker/testdata/.may_include \
 -  scripts/maint/practracker/testdata/a.c  \
 -  scripts/maint/practracker/testdata/b.c  \
 -  scripts/maint/practracker/testdata/ex0-expected.txt \
 -  scripts/maint/practracker/testdata/ex0.txt  \
 -  scripts/maint/practracker/testdata/ex1-expected.txt \
 -  scripts/maint/practracker/testdata/ex1.txt  \
 -  scripts/maint/practracker/testdata/ex1-overbroad-expected.txt   \
 -  scripts/maint/practracker/testdata/ex.txt   \
 -  scripts/maint/practracker/testdata/header.h \
 -  scripts/maint/practracker/testdata/not_c_file   \
 -  scripts/maint/practracker/test_practracker.sh   \
 -  scripts/maint/practracker/util.py
 +  ChangeLog   \
 +  CONTRIBUTING\
 +  CODE_OF_CONDUCT \
 +  INSTALL \
 +  LICENSE \
 +  Makefile.nmake  \
 +  README  \
 +  ReleaseNotes\
 +  scripts/maint/checkIncludes.py  \
 +  scripts/maint/checkSpace.pl \
 +  scripts/maint/checkSpaceTest.sh \
 +  scripts/maint/checkspace_tests/dubious.c\
 +  scripts/maint/checkspace_tests/dubious.h\
 +  scripts/maint/checkspace_tests/expected.txt \
 +  scripts/maint/checkspace_tests/good_guard.h \
 +  scripts/maint/checkspace_tests/same_guard.h \
 +  scripts/maint/checkspace_tests/subdir/dubious.c \
 +  scripts/maint/checkShellScripts.sh  \
 +  scripts/maint/practracker/README\
 +  scripts/maint/practracker/exceptions.txt\
 +  scripts/maint/practracker/includes.py   \
 +  scripts/maint/practracker/metrics.py\
 +  scripts/maint/practracker/practracker.py\
 +  scripts/maint/practracker/practracker_tests.py  \
 +  scripts/maint/practracker/problem.py\
 +  scripts/maint/practracker/testdata/.may_include \
 +  scripts/maint/practracker/testdata/a.c  \
 +  scripts/maint/practracker/testdata/b.c  \
 +  scripts/maint/practracker/testdata/ex0-expected.txt \
 +  scripts/maint/practracker/testdata/ex0.txt  \
 +  scripts/maint/practracker/testdata/ex1-expected.txt \
 +  scripts/maint/practracker/testdata/ex1.txt  \
 +  scripts/maint/practracker/testdata/ex1-overbroad-expected.txt   \
 +  scripts/maint/practracker/testdata/ex1-regen-expected.txt

[tor-commits] [tor/master] Try disabling "make all" when checking docs.

2020-08-12 Thread nickm

commit 50b7bd243fdea1ae1ab3ee0c3304d9d39246581c
Author: Nick Mathewson 
Date:   Wed Aug 12 11:35:15 2020 -0400

Try disabling "make all" when checking docs.
---
 .gitlab-ci.yml  |  2 +-
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 54 ++---
 3 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3959bba024..8ed615687b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,7 +111,6 @@ debian-distcheck:
   script:
 - ./scripts/ci/ci-driver.sh
 
-# TODO: it would be neat to disable the "make all" part of this one.
 debian-docs:
   image: debian:stable
   <<: *debian-template
@@ -119,6 +118,7 @@ debian-docs:
 DOXYGEN: "yes"
 ASCIIDOC: "yes"
 CHECK: "no"
+RUN_STAGE_BUILD: "no"
   script:
 - ./scripts/ci/ci-driver.sh
 
diff --git a/Makefile.am b/Makefile.am
index 5d18666edc..a868be7362 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,6 +149,8 @@ include src/include.am
 include doc/include.am
 include contrib/include.am
 
+manpages: $(nodist_man1_MANS)
+
 EXTRA_DIST+= \
ChangeLog   \
CONTRIBUTING\
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 05c1415da0..ba4b800c04 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -21,6 +21,11 @@ COLOR_CI="${COLOR_CI:-yes}"
 # Options for which CI system this is.
 ON_GITLAB="${ON_GITLAB:-yes}"
 
+# Options for things we usually won't want to skip.
+RUN_STAGE_CONFIGURE="${RUN_STAGE_CONFIGURE:-yes}"
+RUN_STAGE_BUILD="${RUN_STAGE_BUILD:-yes}"
+RUN_STAGE_TEST="${RUN_STAGE_TEST:-yes}"
+
 # Options for how to build Tor.  All should be yes/no.
 FATAL_WARNINGS="${FATAL_WARNINGS:-yes}"
 HARDENING="${HARDENING:-no}"
@@ -165,33 +170,6 @@ else
 }
 fi
 
-if [[ "$*" == "" ]]; then
-RUN_STAGE_CONFIGURE="yes"
-RUN_STAGE_BUILD="yes"
-RUN_STAGE_TEST="yes"
-else
-RUN_STAGE_CONFIGURE="no"
-RUN_STAGE_BUILD="no"
-RUN_STAGE_TEST="no"
-
-for stage in "$@"; do
-   case "$stage" in
-   configure)
-   RUN_STAGE_CONFIGURE="yes"
-   ;;
-   build)
-   RUN_STAGE_BUILD="yes"
-   ;;
-   test)
-   RUN_STAGE_TEST="yes"
-   ;;
-   *)
-   error "Unknown stage $stage"
-   ;;
-   esac
-done
-fi
-
 #
 # Validate inputs.
 
@@ -206,6 +184,10 @@ yes_or_no RUST
 yes_or_no DOXYGEN
 yes_or_no ASCIIDOC
 
+yes_or_no RUN_STAGE_CONFIGURE
+yes_or_no RUN_STAGE_BUILD
+yes_or_no RUN_STAGE_TEST
+
 yes_or_no CHECK
 yes_or_no STEM
 yes_or_no DISTCHECK
@@ -370,6 +352,7 @@ if [[ "$RUN_STAGE_BUILD" = "yes" ]] ; then
end_section Distcheck
 fi
 fi
+
 ##
 # Run tests.
 
@@ -378,13 +361,6 @@ if [[ "$RUN_STAGE_TEST" == "no" ]]; then
 exit 0
 fi
 
-if [[ "$RUN_STAGE_BUILD" = "no" ]] ; then
-debug "Skipped build stage. Making sure that ./src/app/tor exists."
-if [[ ! -f "./src/app/tor" ]]; then
-   die "$(pwd)/src/app/tor does not exist"
-fi
-fi
-
 FAILED_TESTS=""
 
 if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
@@ -397,6 +373,16 @@ if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 
'yes' ]]; then
 end_section Doxygen
 fi
 
+if [[ "${ASCIIDOC}" = 'yes' ]]; then
+start_section Asciidoc
+if runcmd make manpages; then
+hooray "make manpages has succeeded."
+else
+FAILED_TESTS="${FAILED_TESTS} asciidoc"
+fi
+end_section Asciidoc
+fi
+
 if [[ "${CHECK}" = "yes" ]]; then
 start_section "Check"
 if runcmd make "${make_options[@]}" check; then



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-08-12 Thread nickm

commit 02bb719a9494a010b3cad4cf81942ec7619f5806
Merge: 6ef40144ae f5b9471547
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.3' into maint-0.4.4

2020-08-12 Thread nickm

commit f98b1988ec5ca1eb3d2923faf43c1df7541efafb
Merge: 670f5632a5 309eafbc3c
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.4.3' into maint-0.4.4

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/release-0.3.5] CI: improve output when skipping doxygen

2020-08-12 Thread nickm

commit f5b94715479e9b7bef5675ab72c8b2e260bcb830
Author: Nick Mathewson 
Date:   Wed Aug 12 12:13:56 2020 -0400

CI: improve output when skipping doxygen
---
 scripts/ci/ci-driver.sh | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ba4b800c04..6faffd7b40 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -65,12 +65,14 @@ STEM_PATH="${STEM_PATH:-}"
 if [[ "${COLOR_CI}" == "yes" ]]; then
 T_RED=$(tput setaf 1 || true)
 T_GREEN=$(tput setaf 2 || true)
+T_YELLOW=$(tput setaf 3 || true)
 T_DIM=$(tput dim || true)
 T_BOLD=$(tput bold || true)
 T_RESET=$(tput sgr0 || true)
 else
 T_RED=
 T_GREEN=
+T_YELLOW=
 T_DIM=
 T_BOLD=
 T_RESET=
@@ -85,6 +87,12 @@ function die()
 echo "${T_BOLD}${T_RED}FATAL ERROR:${T_RESET} $*" 1>&2
 exit 1
 }
+
+function skipping()
+{
+echo "${T_BOLD}${T_YELLOW}Skipping $*${T_RESET}"
+}
+
 function hooray()
 {
 echo "${T_BOLD}${T_GREEN}$*${T_RESET}"
@@ -363,12 +371,16 @@ fi
 
 FAILED_TESTS=""
 
-if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if [[ "${DOXYGEN}" = 'yes' ]]; then
 start_section Doxygen
-if runcmd make doxygen; then
-   hooray "make doxygen has succeeded."
+if [[ "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if runcmd make doxygen; then
+   hooray "make doxygen has succeeded."
+else
+   FAILED_TESTS="${FAILED_TESTS} doxygen"
+fi
 else
-   FAILED_TESTS="${FAILED_TESTS} doxygen"
+skipping "make doxygen: doxygen is broken for Tor < 0.4.3"
 fi
 end_section Doxygen
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.5] CI: Try to enable integration tests, hardening, and clang.

2020-08-12 Thread nickm

commit fe0e62ddc40a59d4f138d53840a2919e9aac7b4d
Author: Nick Mathewson 
Date:   Wed Aug 12 09:38:19 2020 -0400

CI: Try to enable integration tests, hardening, and clang.
---
 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh |  3 +++
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abc5003678..3959bba024 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,7 @@ variables:
 - apt-get install
 automake
 build-essential
+ca-certificates
 git
 libevent-dev
 liblzma-dev
@@ -77,6 +78,10 @@ variables:
 zlib1g-dev
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
+- if [ "$STEM" = yes ]; then apt-get install timelimit; fi
+- if [ "$CC" = clang ]; then apt-get install clang; fi
+- if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+- if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
 debian-minimal:
   image: debian:stable
@@ -84,17 +89,18 @@ debian-minimal:
   script:
 - ./scripts/ci/ci-driver.sh
 
-###
-# Temporarily diabled. This one just takes too long to finish right now!
+
+# TODO: This one just takes too long to finish right now!
 # Maybe we need to divide the call to ./src/test/test into a few segments,
 # that all end in similar amount of time?
-#debian-hardened:
-#  image: debian:testing
-#  <<: *debian-template
-#  variables:
-#HARDENING: "yes"
-#  script:
-#- ./scripts/ci/ci-driver.sh
+debian-hardened:
+  image: debian:testing
+  <<: *debian-template
+  variables:
+HARDENING: "yes"
+CC: "clang"
+  script:
+- ./scripts/ci/ci-driver.sh
 
 debian-distcheck:
   image: debian:stable
@@ -115,3 +121,13 @@ debian-docs:
 CHECK: "no"
   script:
 - ./scripts/ci/ci-driver.sh
+
+debian-integration:
+  image: debian:stable
+  <<: *debian-template
+  variables:
+CHECK: "no"
+CHUTNEY: "yes"
+# STEM: "yes" -- currently failing on <044.
+  script:
+- ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ad08ee5af0..05c1415da0 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -411,10 +411,13 @@ fi
 
 if [[ "${CHUTNEY}" = "yes" ]]; then
 start_section "Chutney"
+export CHUTNEY_TOR_SANDBOX=0
+export CHUTNEY_ALLOW_FAILURES=2
 if runcmd make "${CHUTNEY_MAKE_TARGET}"; then
 hooray "Chutney tests have succeeded"
 else
 error "Chutney says:"
+export CHUTNEY_DATA_DIR="${CHUTNEY_PATH}/net"
 runcmd "${CHUTNEY_PATH}"/tools/diagnostics.sh || true
 #  These next two should be part of a make target.
 runcmd ls test_network_log || true



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.4] CI: improve output when skipping doxygen

2020-08-12 Thread nickm

commit f5b94715479e9b7bef5675ab72c8b2e260bcb830
Author: Nick Mathewson 
Date:   Wed Aug 12 12:13:56 2020 -0400

CI: improve output when skipping doxygen
---
 scripts/ci/ci-driver.sh | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ba4b800c04..6faffd7b40 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -65,12 +65,14 @@ STEM_PATH="${STEM_PATH:-}"
 if [[ "${COLOR_CI}" == "yes" ]]; then
 T_RED=$(tput setaf 1 || true)
 T_GREEN=$(tput setaf 2 || true)
+T_YELLOW=$(tput setaf 3 || true)
 T_DIM=$(tput dim || true)
 T_BOLD=$(tput bold || true)
 T_RESET=$(tput sgr0 || true)
 else
 T_RED=
 T_GREEN=
+T_YELLOW=
 T_DIM=
 T_BOLD=
 T_RESET=
@@ -85,6 +87,12 @@ function die()
 echo "${T_BOLD}${T_RED}FATAL ERROR:${T_RESET} $*" 1>&2
 exit 1
 }
+
+function skipping()
+{
+echo "${T_BOLD}${T_YELLOW}Skipping $*${T_RESET}"
+}
+
 function hooray()
 {
 echo "${T_BOLD}${T_GREEN}$*${T_RESET}"
@@ -363,12 +371,16 @@ fi
 
 FAILED_TESTS=""
 
-if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if [[ "${DOXYGEN}" = 'yes' ]]; then
 start_section Doxygen
-if runcmd make doxygen; then
-   hooray "make doxygen has succeeded."
+if [[ "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if runcmd make doxygen; then
+   hooray "make doxygen has succeeded."
+else
+   FAILED_TESTS="${FAILED_TESTS} doxygen"
+fi
 else
-   FAILED_TESTS="${FAILED_TESTS} doxygen"
+skipping "make doxygen: doxygen is broken for Tor < 0.4.3"
 fi
 end_section Doxygen
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-08-12 Thread nickm

commit 02bb719a9494a010b3cad4cf81942ec7619f5806
Merge: 6ef40144ae f5b9471547
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.3] Try disabling "make all" when checking docs.

2020-08-12 Thread nickm

commit 50b7bd243fdea1ae1ab3ee0c3304d9d39246581c
Author: Nick Mathewson 
Date:   Wed Aug 12 11:35:15 2020 -0400

Try disabling "make all" when checking docs.
---
 .gitlab-ci.yml  |  2 +-
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 54 ++---
 3 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3959bba024..8ed615687b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -111,7 +111,6 @@ debian-distcheck:
   script:
 - ./scripts/ci/ci-driver.sh
 
-# TODO: it would be neat to disable the "make all" part of this one.
 debian-docs:
   image: debian:stable
   <<: *debian-template
@@ -119,6 +118,7 @@ debian-docs:
 DOXYGEN: "yes"
 ASCIIDOC: "yes"
 CHECK: "no"
+RUN_STAGE_BUILD: "no"
   script:
 - ./scripts/ci/ci-driver.sh
 
diff --git a/Makefile.am b/Makefile.am
index 5d18666edc..a868be7362 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,6 +149,8 @@ include src/include.am
 include doc/include.am
 include contrib/include.am
 
+manpages: $(nodist_man1_MANS)
+
 EXTRA_DIST+= \
ChangeLog   \
CONTRIBUTING\
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index 05c1415da0..ba4b800c04 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -21,6 +21,11 @@ COLOR_CI="${COLOR_CI:-yes}"
 # Options for which CI system this is.
 ON_GITLAB="${ON_GITLAB:-yes}"
 
+# Options for things we usually won't want to skip.
+RUN_STAGE_CONFIGURE="${RUN_STAGE_CONFIGURE:-yes}"
+RUN_STAGE_BUILD="${RUN_STAGE_BUILD:-yes}"
+RUN_STAGE_TEST="${RUN_STAGE_TEST:-yes}"
+
 # Options for how to build Tor.  All should be yes/no.
 FATAL_WARNINGS="${FATAL_WARNINGS:-yes}"
 HARDENING="${HARDENING:-no}"
@@ -165,33 +170,6 @@ else
 }
 fi
 
-if [[ "$*" == "" ]]; then
-RUN_STAGE_CONFIGURE="yes"
-RUN_STAGE_BUILD="yes"
-RUN_STAGE_TEST="yes"
-else
-RUN_STAGE_CONFIGURE="no"
-RUN_STAGE_BUILD="no"
-RUN_STAGE_TEST="no"
-
-for stage in "$@"; do
-   case "$stage" in
-   configure)
-   RUN_STAGE_CONFIGURE="yes"
-   ;;
-   build)
-   RUN_STAGE_BUILD="yes"
-   ;;
-   test)
-   RUN_STAGE_TEST="yes"
-   ;;
-   *)
-   error "Unknown stage $stage"
-   ;;
-   esac
-done
-fi
-
 #
 # Validate inputs.
 
@@ -206,6 +184,10 @@ yes_or_no RUST
 yes_or_no DOXYGEN
 yes_or_no ASCIIDOC
 
+yes_or_no RUN_STAGE_CONFIGURE
+yes_or_no RUN_STAGE_BUILD
+yes_or_no RUN_STAGE_TEST
+
 yes_or_no CHECK
 yes_or_no STEM
 yes_or_no DISTCHECK
@@ -370,6 +352,7 @@ if [[ "$RUN_STAGE_BUILD" = "yes" ]] ; then
end_section Distcheck
 fi
 fi
+
 ##
 # Run tests.
 
@@ -378,13 +361,6 @@ if [[ "$RUN_STAGE_TEST" == "no" ]]; then
 exit 0
 fi
 
-if [[ "$RUN_STAGE_BUILD" = "no" ]] ; then
-debug "Skipped build stage. Making sure that ./src/app/tor exists."
-if [[ ! -f "./src/app/tor" ]]; then
-   die "$(pwd)/src/app/tor does not exist"
-fi
-fi
-
 FAILED_TESTS=""
 
 if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
@@ -397,6 +373,16 @@ if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 
'yes' ]]; then
 end_section Doxygen
 fi
 
+if [[ "${ASCIIDOC}" = 'yes' ]]; then
+start_section Asciidoc
+if runcmd make manpages; then
+hooray "make manpages has succeeded."
+else
+FAILED_TESTS="${FAILED_TESTS} asciidoc"
+fi
+end_section Asciidoc
+fi
+
 if [[ "${CHECK}" = "yes" ]]; then
 start_section "Check"
 if runcmd make "${make_options[@]}" check; then



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/master] CI: improve output when skipping doxygen

2020-08-12 Thread nickm

commit f5b94715479e9b7bef5675ab72c8b2e260bcb830
Author: Nick Mathewson 
Date:   Wed Aug 12 12:13:56 2020 -0400

CI: improve output when skipping doxygen
---
 scripts/ci/ci-driver.sh | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ba4b800c04..6faffd7b40 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -65,12 +65,14 @@ STEM_PATH="${STEM_PATH:-}"
 if [[ "${COLOR_CI}" == "yes" ]]; then
 T_RED=$(tput setaf 1 || true)
 T_GREEN=$(tput setaf 2 || true)
+T_YELLOW=$(tput setaf 3 || true)
 T_DIM=$(tput dim || true)
 T_BOLD=$(tput bold || true)
 T_RESET=$(tput sgr0 || true)
 else
 T_RED=
 T_GREEN=
+T_YELLOW=
 T_DIM=
 T_BOLD=
 T_RESET=
@@ -85,6 +87,12 @@ function die()
 echo "${T_BOLD}${T_RED}FATAL ERROR:${T_RESET} $*" 1>&2
 exit 1
 }
+
+function skipping()
+{
+echo "${T_BOLD}${T_YELLOW}Skipping $*${T_RESET}"
+}
+
 function hooray()
 {
 echo "${T_BOLD}${T_GREEN}$*${T_RESET}"
@@ -363,12 +371,16 @@ fi
 
 FAILED_TESTS=""
 
-if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if [[ "${DOXYGEN}" = 'yes' ]]; then
 start_section Doxygen
-if runcmd make doxygen; then
-   hooray "make doxygen has succeeded."
+if [[ "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if runcmd make doxygen; then
+   hooray "make doxygen has succeeded."
+else
+   FAILED_TESTS="${FAILED_TESTS} doxygen"
+fi
 else
-   FAILED_TESTS="${FAILED_TESTS} doxygen"
+skipping "make doxygen: doxygen is broken for Tor < 0.4.3"
 fi
 end_section Doxygen
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.3] CI: improve output when skipping doxygen

2020-08-12 Thread nickm

commit f5b94715479e9b7bef5675ab72c8b2e260bcb830
Author: Nick Mathewson 
Date:   Wed Aug 12 12:13:56 2020 -0400

CI: improve output when skipping doxygen
---
 scripts/ci/ci-driver.sh | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ba4b800c04..6faffd7b40 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -65,12 +65,14 @@ STEM_PATH="${STEM_PATH:-}"
 if [[ "${COLOR_CI}" == "yes" ]]; then
 T_RED=$(tput setaf 1 || true)
 T_GREEN=$(tput setaf 2 || true)
+T_YELLOW=$(tput setaf 3 || true)
 T_DIM=$(tput dim || true)
 T_BOLD=$(tput bold || true)
 T_RESET=$(tput sgr0 || true)
 else
 T_RED=
 T_GREEN=
+T_YELLOW=
 T_DIM=
 T_BOLD=
 T_RESET=
@@ -85,6 +87,12 @@ function die()
 echo "${T_BOLD}${T_RED}FATAL ERROR:${T_RESET} $*" 1>&2
 exit 1
 }
+
+function skipping()
+{
+echo "${T_BOLD}${T_YELLOW}Skipping $*${T_RESET}"
+}
+
 function hooray()
 {
 echo "${T_BOLD}${T_GREEN}$*${T_RESET}"
@@ -363,12 +371,16 @@ fi
 
 FAILED_TESTS=""
 
-if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if [[ "${DOXYGEN}" = 'yes' ]]; then
 start_section Doxygen
-if runcmd make doxygen; then
-   hooray "make doxygen has succeeded."
+if [[ "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if runcmd make doxygen; then
+   hooray "make doxygen has succeeded."
+else
+   FAILED_TESTS="${FAILED_TESTS} doxygen"
+fi
 else
-   FAILED_TESTS="${FAILED_TESTS} doxygen"
+skipping "make doxygen: doxygen is broken for Tor < 0.4.3"
 fi
 end_section Doxygen
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.4] CI: Try to enable integration tests, hardening, and clang.

2020-08-12 Thread nickm

commit fe0e62ddc40a59d4f138d53840a2919e9aac7b4d
Author: Nick Mathewson 
Date:   Wed Aug 12 09:38:19 2020 -0400

CI: Try to enable integration tests, hardening, and clang.
---
 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh |  3 +++
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abc5003678..3959bba024 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,7 @@ variables:
 - apt-get install
 automake
 build-essential
+ca-certificates
 git
 libevent-dev
 liblzma-dev
@@ -77,6 +78,10 @@ variables:
 zlib1g-dev
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
+- if [ "$STEM" = yes ]; then apt-get install timelimit; fi
+- if [ "$CC" = clang ]; then apt-get install clang; fi
+- if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+- if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
 debian-minimal:
   image: debian:stable
@@ -84,17 +89,18 @@ debian-minimal:
   script:
 - ./scripts/ci/ci-driver.sh
 
-###
-# Temporarily diabled. This one just takes too long to finish right now!
+
+# TODO: This one just takes too long to finish right now!
 # Maybe we need to divide the call to ./src/test/test into a few segments,
 # that all end in similar amount of time?
-#debian-hardened:
-#  image: debian:testing
-#  <<: *debian-template
-#  variables:
-#HARDENING: "yes"
-#  script:
-#- ./scripts/ci/ci-driver.sh
+debian-hardened:
+  image: debian:testing
+  <<: *debian-template
+  variables:
+HARDENING: "yes"
+CC: "clang"
+  script:
+- ./scripts/ci/ci-driver.sh
 
 debian-distcheck:
   image: debian:stable
@@ -115,3 +121,13 @@ debian-docs:
 CHECK: "no"
   script:
 - ./scripts/ci/ci-driver.sh
+
+debian-integration:
+  image: debian:stable
+  <<: *debian-template
+  variables:
+CHECK: "no"
+CHUTNEY: "yes"
+# STEM: "yes" -- currently failing on <044.
+  script:
+- ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ad08ee5af0..05c1415da0 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -411,10 +411,13 @@ fi
 
 if [[ "${CHUTNEY}" = "yes" ]]; then
 start_section "Chutney"
+export CHUTNEY_TOR_SANDBOX=0
+export CHUTNEY_ALLOW_FAILURES=2
 if runcmd make "${CHUTNEY_MAKE_TARGET}"; then
 hooray "Chutney tests have succeeded"
 else
 error "Chutney says:"
+export CHUTNEY_DATA_DIR="${CHUTNEY_PATH}/net"
 runcmd "${CHUTNEY_PATH}"/tools/diagnostics.sh || true
 #  These next two should be part of a make target.
 runcmd ls test_network_log || true



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.4] Merge branch 'maint-0.4.2' into maint-0.4.3

2020-08-12 Thread nickm

commit 309eafbc3c0064a670f5f4b11c3639f7ade6229b
Merge: 489d33e190 02bb719a94
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.4.2' into maint-0.4.3

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)

diff --cc Makefile.am
index 3b30c01f00,f6346fe0fc..1041494da7
--- a/Makefile.am
+++ b/Makefile.am
@@@ -162,53 -157,40 +162,55 @@@ include src/include.a
  include doc/include.am
  include contrib/include.am
  
+ manpages: $(nodist_man1_MANS)
+ 
  EXTRA_DIST+= \
 -  ChangeLog   \
 -  CONTRIBUTING\
 -  CODE_OF_CONDUCT \
 -  INSTALL \
 -  LICENSE \
 -  Makefile.nmake  \
 -  README  \
 -  ReleaseNotes\
 -  scripts/maint/checkIncludes.py  \
 -  scripts/maint/checkSpace.pl \
 -  scripts/maint/checkShellScripts.sh  \
 -  scripts/maint/practracker/README\
 -  scripts/maint/practracker/exceptions.txt\
 -  scripts/maint/practracker/includes.py   \
 -  scripts/maint/practracker/metrics.py\
 -  scripts/maint/practracker/practracker.py\
 -  scripts/maint/practracker/practracker_tests.py  \
 -  scripts/maint/practracker/problem.py\
 -  scripts/maint/practracker/testdata/.may_include \
 -  scripts/maint/practracker/testdata/a.c  \
 -  scripts/maint/practracker/testdata/b.c  \
 -  scripts/maint/practracker/testdata/ex0-expected.txt \
 -  scripts/maint/practracker/testdata/ex0.txt  \
 -  scripts/maint/practracker/testdata/ex1-expected.txt \
 -  scripts/maint/practracker/testdata/ex1.txt  \
 -  scripts/maint/practracker/testdata/ex1-overbroad-expected.txt   \
 -  scripts/maint/practracker/testdata/ex.txt   \
 -  scripts/maint/practracker/testdata/header.h \
 -  scripts/maint/practracker/testdata/not_c_file   \
 -  scripts/maint/practracker/test_practracker.sh   \
 -  scripts/maint/practracker/util.py
 +  ChangeLog   \
 +  CONTRIBUTING\
 +  CODE_OF_CONDUCT \
 +  INSTALL \
 +  LICENSE \
 +  Makefile.nmake  \
 +  README  \
 +  ReleaseNotes\
 +  scripts/maint/checkIncludes.py  \
 +  scripts/maint/checkSpace.pl \
 +  scripts/maint/checkSpaceTest.sh \
 +  scripts/maint/checkspace_tests/dubious.c\
 +  scripts/maint/checkspace_tests/dubious.h\
 +  scripts/maint/checkspace_tests/expected.txt \
 +  scripts/maint/checkspace_tests/good_guard.h \
 +  scripts/maint/checkspace_tests/same_guard.h \
 +  scripts/maint/checkspace_tests/subdir/dubious.c \
 +  scripts/maint/checkShellScripts.sh  \
 +  scripts/maint/practracker/README\
 +  scripts/maint/practracker/exceptions.txt\
 +  scripts/maint/practracker/includes.py   \
 +  scripts/maint/practracker/metrics.py\
 +  scripts/maint/practracker/practracker.py\
 +  scripts/maint/practracker/practracker_tests.py  \
 +  scripts/maint/practracker/problem.py\
 +  scripts/maint/practracker/testdata/.may_include \
 +  scripts/maint/practracker/testdata/a.c  \
 +  scripts/maint/practracker/testdata/b.c  \
 +  scripts/maint/practracker/testdata/ex0-expected.txt \
 +  scripts/maint/practracker/testdata/ex0.txt  \
 +  scripts/maint/practracker/testdata/ex1-expected.txt \
 +  scripts/maint/practracker/testdata/ex1.txt  \
 +  scripts/maint/practracker/testdata/ex1-overbroad-expected.txt   \
 +  scripts/maint/practracker/testdata/ex1-regen-expected.txt

[tor-commits] [tor/maint-0.4.3] CI: Try to enable integration tests, hardening, and clang.

2020-08-12 Thread nickm

commit fe0e62ddc40a59d4f138d53840a2919e9aac7b4d
Author: Nick Mathewson 
Date:   Wed Aug 12 09:38:19 2020 -0400

CI: Try to enable integration tests, hardening, and clang.
---
 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh |  3 +++
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abc5003678..3959bba024 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,7 @@ variables:
 - apt-get install
 automake
 build-essential
+ca-certificates
 git
 libevent-dev
 liblzma-dev
@@ -77,6 +78,10 @@ variables:
 zlib1g-dev
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
+- if [ "$STEM" = yes ]; then apt-get install timelimit; fi
+- if [ "$CC" = clang ]; then apt-get install clang; fi
+- if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+- if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
 debian-minimal:
   image: debian:stable
@@ -84,17 +89,18 @@ debian-minimal:
   script:
 - ./scripts/ci/ci-driver.sh
 
-###
-# Temporarily diabled. This one just takes too long to finish right now!
+
+# TODO: This one just takes too long to finish right now!
 # Maybe we need to divide the call to ./src/test/test into a few segments,
 # that all end in similar amount of time?
-#debian-hardened:
-#  image: debian:testing
-#  <<: *debian-template
-#  variables:
-#HARDENING: "yes"
-#  script:
-#- ./scripts/ci/ci-driver.sh
+debian-hardened:
+  image: debian:testing
+  <<: *debian-template
+  variables:
+HARDENING: "yes"
+CC: "clang"
+  script:
+- ./scripts/ci/ci-driver.sh
 
 debian-distcheck:
   image: debian:stable
@@ -115,3 +121,13 @@ debian-docs:
 CHECK: "no"
   script:
 - ./scripts/ci/ci-driver.sh
+
+debian-integration:
+  image: debian:stable
+  <<: *debian-template
+  variables:
+CHECK: "no"
+CHUTNEY: "yes"
+# STEM: "yes" -- currently failing on <044.
+  script:
+- ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ad08ee5af0..05c1415da0 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -411,10 +411,13 @@ fi
 
 if [[ "${CHUTNEY}" = "yes" ]]; then
 start_section "Chutney"
+export CHUTNEY_TOR_SANDBOX=0
+export CHUTNEY_ALLOW_FAILURES=2
 if runcmd make "${CHUTNEY_MAKE_TARGET}"; then
 hooray "Chutney tests have succeeded"
 else
 error "Chutney says:"
+export CHUTNEY_DATA_DIR="${CHUTNEY_PATH}/net"
 runcmd "${CHUTNEY_PATH}"/tools/diagnostics.sh || true
 #  These next two should be part of a make target.
 runcmd ls test_network_log || true



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.2] CI: improve output when skipping doxygen

2020-08-12 Thread nickm

commit f5b94715479e9b7bef5675ab72c8b2e260bcb830
Author: Nick Mathewson 
Date:   Wed Aug 12 12:13:56 2020 -0400

CI: improve output when skipping doxygen
---
 scripts/ci/ci-driver.sh | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ba4b800c04..6faffd7b40 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -65,12 +65,14 @@ STEM_PATH="${STEM_PATH:-}"
 if [[ "${COLOR_CI}" == "yes" ]]; then
 T_RED=$(tput setaf 1 || true)
 T_GREEN=$(tput setaf 2 || true)
+T_YELLOW=$(tput setaf 3 || true)
 T_DIM=$(tput dim || true)
 T_BOLD=$(tput bold || true)
 T_RESET=$(tput sgr0 || true)
 else
 T_RED=
 T_GREEN=
+T_YELLOW=
 T_DIM=
 T_BOLD=
 T_RESET=
@@ -85,6 +87,12 @@ function die()
 echo "${T_BOLD}${T_RED}FATAL ERROR:${T_RESET} $*" 1>&2
 exit 1
 }
+
+function skipping()
+{
+echo "${T_BOLD}${T_YELLOW}Skipping $*${T_RESET}"
+}
+
 function hooray()
 {
 echo "${T_BOLD}${T_GREEN}$*${T_RESET}"
@@ -363,12 +371,16 @@ fi
 
 FAILED_TESTS=""
 
-if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if [[ "${DOXYGEN}" = 'yes' ]]; then
 start_section Doxygen
-if runcmd make doxygen; then
-   hooray "make doxygen has succeeded."
+if [[ "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if runcmd make doxygen; then
+   hooray "make doxygen has succeeded."
+else
+   FAILED_TESTS="${FAILED_TESTS} doxygen"
+fi
 else
-   FAILED_TESTS="${FAILED_TESTS} doxygen"
+skipping "make doxygen: doxygen is broken for Tor < 0.4.3"
 fi
 end_section Doxygen
 fi



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.2] CI: Try to enable integration tests, hardening, and clang.

2020-08-12 Thread nickm

commit fe0e62ddc40a59d4f138d53840a2919e9aac7b4d
Author: Nick Mathewson 
Date:   Wed Aug 12 09:38:19 2020 -0400

CI: Try to enable integration tests, hardening, and clang.
---
 .gitlab-ci.yml  | 34 +-
 scripts/ci/ci-driver.sh |  3 +++
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index abc5003678..3959bba024 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,6 +66,7 @@ variables:
 - apt-get install
 automake
 build-essential
+ca-certificates
 git
 libevent-dev
 liblzma-dev
@@ -77,6 +78,10 @@ variables:
 zlib1g-dev
 - if [ "$ASCIIDOC" = yes ]; then apt-get install asciidoc xmlto; fi
 - if [ "$DOXYGEN" = yes ]; then apt-get install doxygen; fi
+- if [ "$STEM" = yes ]; then apt-get install timelimit; fi
+- if [ "$CC" = clang ]; then apt-get install clang; fi
+- if [ "$STEM" = yes ]; then git clone --depth 1 
https://git.torproject.org/stem.git ; export STEM_PATH="$(pwd)/stem"; fi
+- if [ "$CHUTNEY" = yes ]; then git clone --depth 1 
https://git.torproject.org/chutney.git ;  export CHUTNEY_PATH="$(pwd)/chutney"; 
fi
 
 debian-minimal:
   image: debian:stable
@@ -84,17 +89,18 @@ debian-minimal:
   script:
 - ./scripts/ci/ci-driver.sh
 
-###
-# Temporarily diabled. This one just takes too long to finish right now!
+
+# TODO: This one just takes too long to finish right now!
 # Maybe we need to divide the call to ./src/test/test into a few segments,
 # that all end in similar amount of time?
-#debian-hardened:
-#  image: debian:testing
-#  <<: *debian-template
-#  variables:
-#HARDENING: "yes"
-#  script:
-#- ./scripts/ci/ci-driver.sh
+debian-hardened:
+  image: debian:testing
+  <<: *debian-template
+  variables:
+HARDENING: "yes"
+CC: "clang"
+  script:
+- ./scripts/ci/ci-driver.sh
 
 debian-distcheck:
   image: debian:stable
@@ -115,3 +121,13 @@ debian-docs:
 CHECK: "no"
   script:
 - ./scripts/ci/ci-driver.sh
+
+debian-integration:
+  image: debian:stable
+  <<: *debian-template
+  variables:
+CHECK: "no"
+CHUTNEY: "yes"
+# STEM: "yes" -- currently failing on <044.
+  script:
+- ./scripts/ci/ci-driver.sh
diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ad08ee5af0..05c1415da0 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -411,10 +411,13 @@ fi
 
 if [[ "${CHUTNEY}" = "yes" ]]; then
 start_section "Chutney"
+export CHUTNEY_TOR_SANDBOX=0
+export CHUTNEY_ALLOW_FAILURES=2
 if runcmd make "${CHUTNEY_MAKE_TARGET}"; then
 hooray "Chutney tests have succeeded"
 else
 error "Chutney says:"
+export CHUTNEY_DATA_DIR="${CHUTNEY_PATH}/net"
 runcmd "${CHUTNEY_PATH}"/tools/diagnostics.sh || true
 #  These next two should be part of a make target.
 runcmd ls test_network_log || true



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.4.3] Merge branch 'maint-0.3.5' into maint-0.4.2

2020-08-12 Thread nickm

commit 02bb719a9494a010b3cad4cf81942ec7619f5806
Merge: 6ef40144ae f5b9471547
Author: Nick Mathewson 
Date:   Wed Aug 12 12:29:17 2020 -0400

Merge branch 'maint-0.3.5' into maint-0.4.2

 .gitlab-ci.yml  | 36 ---
 Makefile.am |  2 ++
 scripts/ci/ci-driver.sh | 77 +
 3 files changed, 67 insertions(+), 48 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [tor/maint-0.3.5] CI: improve output when skipping doxygen

2020-08-12 Thread nickm

commit f5b94715479e9b7bef5675ab72c8b2e260bcb830
Author: Nick Mathewson 
Date:   Wed Aug 12 12:13:56 2020 -0400

CI: improve output when skipping doxygen
---
 scripts/ci/ci-driver.sh | 20 
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/scripts/ci/ci-driver.sh b/scripts/ci/ci-driver.sh
index ba4b800c04..6faffd7b40 100755
--- a/scripts/ci/ci-driver.sh
+++ b/scripts/ci/ci-driver.sh
@@ -65,12 +65,14 @@ STEM_PATH="${STEM_PATH:-}"
 if [[ "${COLOR_CI}" == "yes" ]]; then
 T_RED=$(tput setaf 1 || true)
 T_GREEN=$(tput setaf 2 || true)
+T_YELLOW=$(tput setaf 3 || true)
 T_DIM=$(tput dim || true)
 T_BOLD=$(tput bold || true)
 T_RESET=$(tput sgr0 || true)
 else
 T_RED=
 T_GREEN=
+T_YELLOW=
 T_DIM=
 T_BOLD=
 T_RESET=
@@ -85,6 +87,12 @@ function die()
 echo "${T_BOLD}${T_RED}FATAL ERROR:${T_RESET} $*" 1>&2
 exit 1
 }
+
+function skipping()
+{
+echo "${T_BOLD}${T_YELLOW}Skipping $*${T_RESET}"
+}
+
 function hooray()
 {
 echo "${T_BOLD}${T_GREEN}$*${T_RESET}"
@@ -363,12 +371,16 @@ fi
 
 FAILED_TESTS=""
 
-if [[ "${DOXYGEN}" = 'yes' && "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if [[ "${DOXYGEN}" = 'yes' ]]; then
 start_section Doxygen
-if runcmd make doxygen; then
-   hooray "make doxygen has succeeded."
+if [[ "${TOR_VER_AT_LEAST_043}" = 'yes' ]]; then
+if runcmd make doxygen; then
+   hooray "make doxygen has succeeded."
+else
+   FAILED_TESTS="${FAILED_TESTS} doxygen"
+fi
 else
-   FAILED_TESTS="${FAILED_TESTS} doxygen"
+skipping "make doxygen: doxygen is broken for Tor < 0.4.3"
 fi
 end_section Doxygen
 fi

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

1 2 >

1 - 100 of 162 matches

Mail list logo