summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2018-10-23 19:50:53 -0400
committerNick Mathewson <nickm@torproject.org>2018-10-23 19:50:53 -0400
commitfd6078b33a0a174a060a2ae90e9455e6f0ee6fe9 (patch)
tree5cb5b7ed7f4f86e29b687efb05a7a643d50f523f
parent7edc594ee732960733d34309980d0e7190e35fb2 (diff)
parentb2c52f5d6d52a70e11bb4f60036dd6772b55661a (diff)
downloadtor-fd6078b33a0a174a060a2ae90e9455e6f0ee6fe9.tar.gz
tor-fd6078b33a0a174a060a2ae90e9455e6f0ee6fe9.zip
Merge branch 'maint-0.3.3' into maint-0.3.4
-rw-r--r--src/rust/protover/ffi.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/rust/protover/ffi.rs b/src/rust/protover/ffi.rs
index f55b87acf6..857a6968af 100644
--- a/src/rust/protover/ffi.rs
+++ b/src/rust/protover/ffi.rs
@@ -7,7 +7,6 @@
use libc::{c_char, c_int, uint32_t};
use std::ffi::CStr;
-use std::ffi::CString;
use smartlist::*;
use tor_allocate::allocate_and_copy_string;