Merge branch 'beta' into mergemaster

# Conflicts:
#	src/main.cpp

doc/man/zcash-tx.1

@@ -1,9 +1,9 @@
-.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.4.
-.TH ZCASH-TX "1" "March 2017" "zcash-tx v1.0.8" "User Commands"
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.3.
+.TH ZCASH-TX "1" "February 2018" "zcash-tx v1.0.15" "User Commands"
 .SH NAME
-zcash-tx \- manual page for zcash-tx v1.0.8
+zcash-tx \- manual page for zcash-tx v1.0.15
 .SH DESCRIPTION
-Zcash zcash\-tx utility version v1.0.8
+Zcash zcash\-tx utility version v1.0.15
 .SS "Usage:"
 .TP
 zcash\-tx [options] <hex\-tx> [commands]
@@ -68,7 +68,7 @@ outscript=VALUE:SCRIPT
 .IP
 Add raw script output to TX
 .IP
-sign=SIGHASH\-FLAGS
+sign=HEIGHT:SIGHASH\-FLAGS
 .IP
 Add zero or more signatures to transaction. This command requires JSON
 registers:prevtxs=JSON object, privatekeys=JSON object. See
@@ -84,6 +84,10 @@ set=NAME:JSON\-STRING
 .IP
 Set register NAME to given JSON\-STRING
 .SH COPYRIGHT
+
+In order to ensure you are adequately protecting your privacy when using Zcash,
+please see <https://z.cash/support/security/>.
+
 Copyright (C) 2009-2017 The Bitcoin Core Developers
 Copyright (C) 2015-2017 The Zcash Developers
 
@@ -94,4 +98,4 @@ or <http://www.opensource.org/licenses/mit-license.php>.
 
 This product includes software developed by the OpenSSL Project for use in the
 OpenSSL Toolkit <https://www.openssl.org/> and cryptographic software written
-by Eric Young and UPnP software written by Thomas Bernard.
+by Eric Young.