Merge pull request bitcoin#1242 from benthecarman/patch-3

Allow Taproot outputs in BIP 322

Author: kallewoof

bip-0322.mediawiki

@@ -120,7 +120,7 @@ Validation consists of the following steps:
 # Check the **upgradeable rules**
 ## The version of <code>to_sign</code> must be 0 or 2.
 ## The use of NOPs reserved for upgrades is forbidden.
-## The use of segwit versions greater than 0 are forbidden.
+## The use of segwit versions greater than 1 are forbidden.
 ## If any of the above steps failed, the validator should stop and output the ''inconclusive'' state.
 # Let ''T'' by the nLockTime of <code>to_sign</code> and ''S'' be the nSequence of the first input of <code>to_sign</code>. Output the state ''valid at time T and age S''.