Merge branch 'master' into optional_donation

diff --cc p2pool/bitcoin/data.py
Simple merge

diff --cc p2pool/data.py
index e62efba,f5e7dd9..b43028c
--- 1/p2pool/data.py
--- 2/p2pool/data.py
+++ b/p2pool/data.py
@@@ -173,10 -146,9 +173,10 @@@ class Share(object)
          if len(self.nonce) > 100:
              raise ValueError('nonce too long!')
          
 -        self.bitcoin_hash = net.BITCOIN_POW_FUNC(header)
 +        self.pow_hash = net.BITCOIN_POW_FUNC(header)
 +        self.header_hash = bitcoin_data.block_header_type.hash256(header)
          
-         if net.BITCOIN_POW_FUNC is bitcoin_data.block_header_type.scrypt:
+         if net.BITCOIN_POW_FUNC == bitcoin_data.block_header_type.scrypt:
              # compatibility hack
              self.hash = share1a_type.scrypt(self.as_share1a())
          else:

diff --cc p2pool/main.py
Simple merge