merge of '13c351b9c26b147632b40df8c0e8d9ca7d2d4485'

and 'b281a23e2f1719a388abed362ec3653f63e6769b'
2010-05-25 19:07:13 +00:00
parent 014063700f 7a1111d845
commit 618275b1f9
1 changed files with 2 additions and 0 deletions
--- a/history.txt
+++ b/history.txt
@@ -1,6 +1,8 @@
 2010-05-23 welterde
    * core:
      - fixed major security hole in DatagramDissector
+    * I2PTunnelServer: Implemented WEBIRC support in IRC server tunnel
+

 2010-05-23 zzz
    * i2psnark: