From 14ea9c292826ddc24cc3d33a127a51fa7a2e6bc9 Mon Sep 17 00:00:00 2001
From: sponge <sponge@mail.i2p>
Date: Thu, 2 Jun 2011 19:02:12 +0000
Subject: [PATCH] fix/merge

---
 history.txt | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/history.txt b/history.txt
index 79b6851819..53958417ef 100644
--- a/history.txt
+++ b/history.txt
@@ -1,6 +1,15 @@
 2011-06-02 sponge
     * Remove txt file in BOB.jar as per zzz's request.
 
+2011-06-02 zzz
+    * Android: Build fixes
+    * Crypto:
+      - HMAC Javadocs and cleanups
+      - HMAC Use SimpleByteCache
+    * ElGamalAESEngine: Fixups required after SessionKey enforcement
+    * Reseed: Give up on a seed after 90% of fetches fail
+    * SessionKey: Enforce data size and prevent reuse
+
 2011-06-01 zzz
     * Crypto:
       - Use java.security.MessageDigest instead of bundled GNU SHA-256 code
-- 
GitLab