From 85e68ff50e24e99c55710dc3fb046df16d64a73b Mon Sep 17 00:00:00 2001
From: slush0 <slush@satoshilabs.com>
Date: Mon, 15 Dec 2014 14:56:51 +0100
Subject: [PATCH] Added PAYTOMULTISIG to TxOutputType

---
 protob/types.proto | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/protob/types.proto b/protob/types.proto
index 7afae5277..de26e0f4f 100644
--- a/protob/types.proto
+++ b/protob/types.proto
@@ -47,6 +47,7 @@ enum FailureType {
 enum OutputScriptType {
 	PAYTOADDRESS = 0;
 	PAYTOSCRIPTHASH = 1;
+	PAYTOMULTISIG = 2;
 }
 
 /**
@@ -164,7 +165,7 @@ message TxOutputType {
 	repeated uint32 address_n = 2;			// BIP-32 path to derive the key from master node; has higher priority than "address"
 	required uint64 amount = 3;			// amount to spend in satoshis
 	required OutputScriptType script_type = 4;	// output script type
-	repeated MultisigRedeemScriptType multisig = 5; // Defines multisig address; when filled, it has priority over address/address_n
+	repeated MultisigRedeemScriptType multisig = 5; // Defines multisig address; script_type must be PAYTOMULTISIG
 }
 
 /**