[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm at torproject.org]

commit 4e653ac2cab08edf0e811ae38204e61bc13f1871
Merge: f02c6bcad af8cadf3a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 17 11:12:15 2018 -0500

    Merge branch 'maint-0.3.1' into maint-0.3.2

 changes/bug24898       |  8 ++++++++
 src/or/command.c       |  6 ------
 src/or/connection_or.c |  6 ++++++
 src/rust/Cargo.lock    | 12 ++++++------
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --cc src/rust/Cargo.lock
index 4ac9606ce,4ac9606ce..e208e1432
--- 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"