From: Matt Corallo <github@bluematt.me>
Date: Mon, 24 Aug 2015 01:31:58 +0000 (-0700)
Subject: Merge pull request #12 from apoelstra/patch-2
X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=bitcoinninja;a=commitdiff_plain;h=d0a96c4ce336d83773543b1ad8bb70c1dc5656af;hp=-c

Merge pull request #12 from apoelstra/patch-2

Add link to gmax's hardfork wishlist
---

d0a96c4ce336d83773543b1ad8bb70c1dc5656af
diff --combined index.html
index fe09473,201347b..a7a25bb
--- a/index.html
+++ b/index.html
@@@ -23,6 -23,7 +23,7 @@@ Useful resources
  <li><a href="http://download.wpsoftware.net/bitcoin/wizards/">Old #bitcoin-wizards logs here</a></li>
  <li><a href="http://bitcoin.sipa.be/">Sipa's hashrate statistics</a></li>
  <li><a href="https://en.bitcoin.it/wiki/User:Gmaxwell/alt_ideas">Gmaxwell's alt-ideas page</a></li>
+ <li><a herf="https://en.bitcoin.it/wiki/Hardfork_Wishlist">Hardfork wishlist</a></li>
  <li><a href="http://diyhpl.us/~bryan/papers2/bitcoin/">Bitcoin-related papers archived by kanzure</a></li>
  </ul>
  
@@@ -46,7 -47,6 +47,7 @@@ Implementations of cool things
  <li><a href="https://github.com/zw/PoLtree/">proving Bitcoin liabilities, in Clojure.</a> or <a href="https://github.com/olalonde/proof-of-liabilities">Proof of Liabilities, in JavaScript</a></li>
  <li><a href="https://github.com/petertodd/timelock">Create a secret key that can be decrypted in a known amount of time using parallel-serial hash chains.</a></li>
  <li><a href="https://github.com/Blockstream/contracthashtool">Pay to Contract Hash calculator</a></li>
 +<li><a href="https://github.com/vinumeris/lighthouse/blob/master/docs/Design%20doc.md">Lighthouse - simple SIGHASH_ANYONECANPAY multi-party payments</a></li>
  </ul>
  
  Edit this page at <a href="https://github.com/TheBlueMatt/bitcoinninja">https://github.com/TheBlueMatt/bitcoinninja</a>