Merge pull request #3666

bbfce8a fix non-standard reason string in main.cpp (Philip Kaufmann)

Author: laanwj

src/main.cpp

@@ -443,7 +443,7 @@ bool IsStandardTx(const CTransaction& tx, string& reason)
             return false;
         }
         if (!txin.scriptSig.HasCanonicalPushes()) {
-            reason = "non-canonical-push";
+            reason = "scriptsig-non-canonical-push";
             return false;
         }
     }