merge of '2c288e0ac5d4a6039b3f08e6bbae9439bb038955'

and 'fa8975b2dbcb60d5f181bc21fc1245d5f82baef0'
2013-10-29 21:04:40 +00:00
parent d2ee5b96ad 79f5484f87
commit 1cffcae36b
1 changed files with 3 additions and 0 deletions
--- a/history.txt
+++ b/history.txt
@@ -16,6 +16,9 @@
 2013-10-29 meeh
 * Adding no.i2p registrar

+2013-10-28 dg
+ * I2PTunnel: Enable persistent keying for SOCKS tunnels (ticket #1088)
+
 2013-10-27 zzz
 * Streaming; Fix crash caused by previous blacklist fix (ticket #1070)