From 2ac57f2d12572309da82169b867339e144710100 Mon Sep 17 00:00:00 2001
From: Thomas Waldmann <tw@waldmann-edv.de>
Date: Sun, 22 Mar 2015 14:56:22 +0100
Subject: [PATCH] add condensed description of the changes in merge-all branch

---
 CHANGES-merge-all.txt | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 CHANGES-merge-all.txt

diff --git a/CHANGES-merge-all.txt b/CHANGES-merge-all.txt
new file mode 100644
index 000000000..6824a783e
--- /dev/null
+++ b/CHANGES-merge-all.txt
@@ -0,0 +1,23 @@
+Stuff in merge-all and not in merge minus minor changes:
+
+added tuning docs
+
+attic init --compression NN --cipher NN --mac NN ...
+(see attic init --help)
+
+new hashes:      sha512_256
+                 ghash (default)
+new MACs:        hmac-sha512-256
+                 gmac (default)
+new ciphers:     aes256-ctr + hmac-sha512-256
+                 aes256-gcm (default)
+new compression: no compression (default)
+                 zlib level 1..9 (previously, level 6 was hardcoded)
+                 lzma preset 0..9
+
+source: more flexible type 0x03 header format, allowing to give hash algo,
+compression algo and level, encryption algo, key type.
+
+source: less hardcoding, numeric offsets / lengths
+source: flexible hashing, compression, encryption, key dispatching
+