From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 17 Jan 2018 16:12:15 +0000 (-0500)
Subject: Merge branch 'maint-0.3.1' into maint-0.3.2
X-Git-Tag: tor-0.3.3.1-alpha~33^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4e653ac2cab08edf0e811ae38204e61bc13f1871;p=thirdparty%2Ftor.git

Merge branch 'maint-0.3.1' into maint-0.3.2
---

4e653ac2cab08edf0e811ae38204e61bc13f1871
diff --cc src/rust/Cargo.lock
index 4ac9606ce8,4ac9606ce8..e208e14320
--- a/src/rust/Cargo.lock
+++ b/src/rust/Cargo.lock
@@@ -1,14 -1,14 +1,14 @@@
--[root]
++[[package]]
++name = "libc"
++version = "0.2.22"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++
++[[package]]
  name = "tor_util"
  version = "0.0.1"
  dependencies = [
   "libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)",
  ]
  
--[[package]]
--name = "libc"
--version = "0.2.22"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--
  [metadata]
  "checksum libc 0.2.22 (registry+https://github.com/rust-lang/crates.io-index)" = "babb8281da88cba992fa1f4ddec7d63ed96280a1a53ec9b919fd37b53d71e502"