diff options
author | Alexander Færøy <ahf@torproject.org> | 2020-11-09 14:15:03 +0000 |
---|---|---|
committer | Alexander Færøy <ahf@torproject.org> | 2020-11-09 14:15:03 +0000 |
commit | 0702cf10db0ab0824d8d4d5df467fb15fc832f2e (patch) | |
tree | 840fee3bfd86ef10bae78aa4fbfd3bca0acaa982 | |
parent | 5e65a746aa90f123daa54cafedc0fcb331a7ac86 (diff) | |
parent | 31d542a9c6f15536590b1194464b3c05fb11533d (diff) | |
download | tor-0702cf10db0ab0824d8d4d5df467fb15fc832f2e.tar.gz tor-0702cf10db0ab0824d8d4d5df467fb15fc832f2e.zip |
Merge remote-tracking branch 'tor-gitlab/mr/192'
-rw-r--r-- | .gitlab-ci.yml | 1 | ||||
-rw-r--r-- | src/core/or/include.am | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba61c71b2b..a672d8ed39 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -170,6 +170,7 @@ debian-tracing: variables: TRACING: "yes" CHECK: "no" + DISTCHECK: "yes" script: - ./scripts/ci/ci-driver.sh # Ensure that we only run tracing when it's implemented. diff --git a/src/core/or/include.am b/src/core/or/include.am index 9ff92adbde..7c42268c46 100644 --- a/src/core/or/include.am +++ b/src/core/or/include.am @@ -71,6 +71,7 @@ noinst_HEADERS += \ src/core/or/entry_port_cfg_st.h \ src/core/or/extend_info_st.h \ src/core/or/listener_connection_st.h \ + src/core/or/lttng_circuit.inc \ src/core/or/onion.h \ src/core/or/or.h \ src/core/or/or_periodic.h \ |