Merge remote-tracking branch 'upstream/master' into ethHashAppendix

Conflicts: Biblio.bib
ethereum · May 4, 2015 · 77a8cf2 · 77a8cf2
2 parents 529f8d0 + 743c515
commit 77a8cf2
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 63 deletions.
diff --git a/Biblio.bib b/Biblio.bib
@@ -101,6 +101,20 @@ @article{back2002hashcash
 	year = {{2002}},
 }
 
+@article{hashimoto,
+	url = {{https://mirrorx.com/files/hashimoto.pdf}},
+	author = {Thaddeus Dryja},
+	title = {{Hashimoto: I/O bound proof of work}},
+	year = {{2014}},
+}
+
+@article{dagger,
+	url = {{http://vitalik.ca/ethereum/dagger.html}},
+	author = {Vitalik Buterin},
+	title = {{Dagger: A Memory-Hard to Compute, Memory-Easy to Verify Scrypt Alternative}},
+	year = {{2013}},
+}
+
 @article{lerner2014randmemohash,
 	url = {{http://www.hashcash.org/papers/memohash.pdf}},
 	author = {Sergio Demian Lerner},