Merge branch 'gradle' into development

Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib

2 files changed, 23 insertions, 6 deletions

diff --git a/libs/minidns b/libs/minidns
deleted file mode 160000
-Subproject 152be6eb1a22da8cebe24ac4ee05b487936c9f2
diff --git a/libs/minidns/src/main/java/de/measite/minidns/DNSCache.java b/libs/minidns/src/main/java/de/measite/minidns/DNSCache.java
new file mode 100644
index 00000000..14a3a776
--- /dev/null
+++ b/libs/minidns/src/main/java/de/measite/minidns/DNSCache.java
@@ -0,0 +1,23 @@
+package de.measite.minidns;
+
+/**
+ * Cache for DNS Entries. Implementations must be thread safe.
+ */
+public interface DNSCache {
+
+    /**
+     * Add an an dns answer/response for a given dns question. Implementations
+     * should honor the ttl / receive timestamp.
+     * @param q The question.
+     * @param message The dns message.
+     */
+    void put(Question q, DNSMessage message);
+
+    /**
+     * Request a cached dns response.
+     * @param q The dns question.
+     * @return The dns message.
+     */
+    DNSMessage get(Question q);
+
+}