Merge branch 'maint-0.3.1' into maint-0.3.2

diff --cc src/or/command.c
Simple merge

diff --cc src/or/connection_or.c
Simple merge

diff --cc src/rust/Cargo.lock
index 4ac9606ce889d56d273ec04375524aad3c4302eb,4ac9606ce889d56d273ec04375524aad3c4302eb..e208e14320d21898b2fc29d5950a3688136ee83a
--- 1/src/rust/Cargo.lock
--- 2/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"