Fixing conflicts

Dependencies

• [2] 634OYCNM Tokio 0.3
• [3] MFMCIUMJ Fixing authentication with RSA
• [4] 7FRJYUI6 Reboot because of a bad change

Change contents

• edit in thrussh-keys/src/agent/server.rs at line 317
  [4.135841]→[4.135841:135919](∅→∅),[4.135841]→[4.135841:135919](∅→∅)
  − delay_for(Duration::from_secs(seconds as u64)).await;
• edit in thrussh-keys/Cargo.toml at line 3
  [4.157057]→[3.435:454](∅→∅)
  − version = "0.18.8"
• edit in thrussh-keys/Cargo.toml at line 33
  [4.157794]→[4.157794:157888](∅→∅),[4.157794]→[4.157794:157888](∅→∅)
  − tokio = { version = "0.2", features = [ "io-util", "rt-threaded", "time", "uds", "stream" ] }
• edit in thrussh/src/ssh_read.rs at line 51
  [4.167958]→[4.167958:168029](∅→∅),[4.167958]→[4.167958:168029](∅→∅)
  − buf: &mut [u8],

  − ) -> Poll<Result<usize, std::io::Error>> {
• edit in thrussh/src/ssh_read.rs at line 56
  [4.168179]→[4.168179:168371](∅→∅),[4.168179]→[4.168179:168371](∅→∅)
  − let result = {

  − let mut readable = &id.buf[id.bytes_read..id.total];

  − std::io::Read::read(&mut readable, buf).unwrap()

  − };
• edit in thrussh/src/ssh_read.rs at line 58
  [4.168434]→[4.168434:168475](∅→∅),[4.168434]→[4.168434:168475](∅→∅)
  − id.bytes_read += result;
• edit in thrussh/src/ssh_read.rs at line 60
  [4.168511]→[4.168511:168559](∅→∅),[4.168511]→[4.168511:168559](∅→∅)
  − return Poll::Ready(Ok(result));
• edit in thrussh/src/server/mod.rs at line 416
  [4.217164]→[4.217164:217184](∅→∅),[4.217164]→[4.217164:217184](∅→∅)
  − .incoming()
• edit in thrussh/src/server/mod.rs at line 436
  [4.217766]→[4.217766:217810](∅→∅),[4.217766]→[4.217766:217810](∅→∅)
  − tokio::time::delay_for(delay).await
• edit in thrussh/src/server/encrypted.rs at line 399
  [4.245597]→[4.245597:245639](∅→∅),[4.245597]→[4.245597:245639](∅→∅)
  − tokio::time::delay_until(until).await
• edit in thrussh/src/client/proxy.rs at line 32
  [4.333711]→[4.333711:333784](∅→∅),[4.333711]→[4.333711:333784](∅→∅)
  − buf: &mut [u8],

  − ) -> Poll<Result<usize, tokio::io::Error>> {
• edit in thrussh/src/client/proxy.rs at line 35
  [4.333806]→[4.333806:333897](∅→∅),[4.333806]→[4.333806:333897](∅→∅)
  − Stream::Child(ref mut c) => Poll::Ready(c.stdout.as_mut().unwrap().read(buf)),
• edit in thrussh/Cargo.toml at line 45
  [4.427069]→[4.427069:427105](∅→∅),[4.427069]→[4.427069:427105](∅→∅)
  − log = "0.4"

  − thrussh-keys = "0.18.3"
• edit in thrussh/Cargo.toml at line 50
  [4.427168]→[4.427168:427280](∅→∅),[4.427168]→[4.427168:427280](∅→∅)
  − tokio = { version = "0.2", features = [ "io-util", "rt-threaded", "time", "stream", "tcp", "sync", "macros" ] }
• edit in thrussh/Cargo.toml at line 58
  [4.427414]→[4.427414:427526](∅→∅),[4.427414]→[4.427414:427526](∅→∅)
  − tokio = { version = "0.2", features = [ "io-util", "rt-threaded", "time", "stream", "tcp", "sync", "macros" ] }