[tor-commits] [tor/main] Merge branch 'ticket40527_046_01' into ticket40527_047_01

[ahf at torproject.org]

commit ad6a0ebb119dba09fd1a0d1d6eb2a1362803bce3
Merge: b4c55f3a70 cda7acb35d
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Dec 13 10:48:54 2021 -0500

    Merge branch 'ticket40527_046_01' into ticket40527_047_01

 changes/ticket40527         |  5 +++
 config.rust                 | 24 +++++++++++++
 src/feature/stats/rephist.c | 12 -------
 src/rust/.cargo/config      | 12 +++++++
 src/test/test_stats.c       | 82 ++-------------------------------------------
 5 files changed, 44 insertions(+), 91 deletions(-)

diff --cc config.rust
index 0000000000,0000000000..878a231cda
new file mode 100644
--- /dev/null
+++ b/config.rust
@@@ -1,0 -1,0 +1,24 @@@
++# Used by our cargo build.rs script to get variables from autoconf.
++#
++# The "configure" script will generate "config.rust" from "config.rust.in",
++# and then build.rs will read "config.rust".
++
++BUILDDIR=/home/dgoulet/Documents/git/tor
++TOR_LDFLAGS_zlib=
++TOR_LDFLAGS_nss=@TOR_LDFLAGS_nss@
++TOR_LDFLAGS_openssl=
++TOR_LDFLAGS_libevent=
++TOR_ZLIB_LIBS=-lz
++TOR_LIB_MATH=-lm
++TOR_LIBEVENT_LIBS=-levent
++TOR_OPENSSL_LIBS=-lssl -lcrypto
++TOR_LIB_WS32=
++TOR_LIB_GDI=
++TOR_LIB_USERENV=
++CURVE25519_LIBS=
++TOR_SYSTEMD_LIBS=-lsystemd
++TOR_LZMA_LIBS=-llzma
++TOR_ZSTD_LIBS=-lzstd
++LIBS=-lseccomp -lcap 
++LDFLAGS= -pie -z relro -z now -rdynamic
++NSS_LIBS=
diff --cc src/rust/.cargo/config
index 0000000000,0000000000..d91e26719d
new file mode 100644
--- /dev/null
+++ b/src/rust/.cargo/config
@@@ -1,0 -1,0 +1,12 @@@
++[source]
++
++ [source.crates-io]
++ registry = 'https://github.com/rust-lang/crates.io-index'
++ replace-with = 'vendored-sources'
++
++ [source.vendored-sources]
++ directory = ''
++
++[build]
++ rustflags = [ "-D", "warnings" ]
++