Merge branch '0.5.0.x' into 0.5.x

2 files changed, 5 insertions, 1 deletions

diff --git a/src/main.cpp b/src/main.cpp
index a7871fcc1..f21af9047 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2828,7 +2828,7 @@ CBlock* CreateNewBlock(CReserveKey& reservekey)
 
             // Transaction fee required depends on block size
             bool fAllowFree = (nBlockSize + nTxSize < 4000 || CTransaction::AllowFree(dPriority));
-            int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree, true);
+            int64 nMinFee = tx.GetMinFee(nBlockSize, fAllowFree);
 
             // Connecting shouldn't fail due to dependency on other memory pool transactions
             // because we're already processing them in order of dependency
diff --git a/src/util.h b/src/util.h
index 1ef0e6f15..dcf060e3e 100644
--- a/src/util.h
+++ b/src/util.h
@@ -296,6 +296,10 @@ public:
 // (secure_allocator<> is defined in serialize.h)
 typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString;
 
+// This is exactly like std::string, but with a custom allocator.
+// (secure_allocator<> is defined in serialize.h)
+typedef std::basic_string<char, std::char_traits<char>, secure_allocator<char> > SecureString;
+