From 7b2d3c9e2f61e34248aa1192ec5325b544e1124c Mon Sep 17 00:00:00 2001
From: Patrick Schleizer <adrelanos@riseup.net>
Date: Wed, 26 Jul 2017 14:37:34 +0000
Subject: [PATCH] bumped changelog version

---
 changelog.upstream | 28 ++++++++++++++++++++++++++++
 debian/changelog   |  6 ++++++
 2 files changed, 34 insertions(+)

diff --git a/changelog.upstream b/changelog.upstream
index be5a37b..feb46b1 100644
--- a/changelog.upstream
+++ b/changelog.upstream
@@ -1,3 +1,31 @@
+commit dc2c9a9992551f5967e09b31a90721a9aadaf962
+Merge: 61bd4d0 91ff0c2
+Author: Patrick Schleizer <adrelanos@riseup.net>
+Date:   Tue Mar 14 13:43:18 2017 +0000
+
+    Merge remote-tracking branch 'origin/master'
+
+commit 91ff0c2571b41710440006e770b8295c03b3a295
+Merge: 61bd4d0 6e5e5d6
+Author: Patrick Schleizer <adrelanos@riseup.net>
+Date:   Tue Mar 14 13:42:37 2017 +0000
+
+    Merge pull request #2 from HulaHoopWhonix/patch-2
+    
+    Update README.md
+
+commit 6e5e5d6ea65a0fee4c76e5ad74c444344ff1f462
+Author: HulaHoopWhonix <bancfc@openmailbox.org>
+Date:   Tue Mar 14 13:11:44 2017 +0000
+
+    Update README.md
+
+commit 61bd4d05b76088657e392cb311983617b8a68750
+Author: Patrick Schleizer <adrelanos@riseup.net>
+Date:   Mon Mar 6 16:16:32 2017 +0000
+
+    bumped changelog version
+
 commit 99bb1e877ec84bf7d3c6873f0369aed2fb92be4b
 Author: Patrick Schleizer <adrelanos@riseup.net>
 Date:   Mon Mar 6 15:00:33 2017 +0000
diff --git a/debian/changelog b/debian/changelog
index 1d5c96d..7171f4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+security-misc (3:1.2-1) unstable; urgency=medium
+
+  * New upstream version (local package).
+
+ -- Patrick Schleizer <adrelanos@riseup.net>  Wed, 26 Jul 2017 14:37:34 +0000
+
 security-misc (3:1.1-1) unstable; urgency=medium
 
   * New upstream version (local package).