Merge branch 'master' into eth1-deploy

beacon_node/src/cli.rs

@@ -221,6 +221,13 @@ pub fn cli_app<'a, 'b>() -> App<'a, 'b> {
                     .help("If present, append a random string to the datadir path. Useful for fast development \
                           iteration.")
             )
+            .arg(
+                Arg::with_name("random-propagation")
+                    .long("random-propagation")
+                    .value_name("INTEGER")
+                    .takes_value(true)
+                    .help("Specifies (as a percentage) the likelihood of propagating blocks and attestations. This should only be used for testing networking elements. The value must like in the range 1-100.")
+            )
             .arg(
                 Arg::with_name("force")
                     .long("force")