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

[nickm@xxxxxxxxxxxxxx]

commit c19bb4d62e9bf3d969a6950e529a95e2f98b7e1c
Merge: ed8a853bd ee1cc0fea
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Oct 30 08:45:49 2018 -0400

    Merge branch 'maint-0.3.5'

 .travis.yml                      | 15 +++++----------
 changes/rust_asan                |  8 ++++++++
 configure.ac                     |  9 ++++-----
 link_rust.sh.in                  | 10 ----------
 src/rust/Cargo.lock              |  1 +
 src/rust/Cargo.toml              | 16 ----------------
 src/rust/crypto/Cargo.toml       |  1 -
 src/rust/external/Cargo.toml     |  6 ++----
 src/rust/external/lib.rs         |  2 +-
 src/rust/protover/Cargo.toml     |  1 -
 src/rust/smartlist/Cargo.toml    |  1 -
 src/rust/smartlist/lib.rs        |  9 +++++++++
 src/rust/tor_allocate/Cargo.toml |  1 -
 src/rust/tor_allocate/lib.rs     |  5 +++++
 src/rust/tor_log/Cargo.toml      |  1 -
 src/rust/tor_rust/Cargo.toml     |  2 +-
 src/rust/tor_util/Cargo.toml     |  1 -
 src/test/include.am              |  3 +--
 src/test/test_rust.sh            | 10 +++++++++-
 19 files changed, 46 insertions(+), 56 deletions(-)

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