summary refs log tree commit diff
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2019-05-03 16:03:24 +0100
committerRichard van der Hoff <richard@matrix.org>2019-05-03 16:03:24 +0100
commit863ec0962210fcb946e68caa7431f69583814c73 (patch)
treecf99c8065bb0cf79748966acd1cbe60ad78713a7
parentMerge pull request #5134 from matrix-org/rav/url_preview_blacklist (diff)
downloadsynapse-863ec0962210fcb946e68caa7431f69583814c73.tar.xz
0.99.3.1
-rw-r--r--CHANGES.md9
-rw-r--r--changelog.d/5133.bugfix1
-rw-r--r--changelog.d/5134.bugfix1
-rw-r--r--debian/changelog6
-rw-r--r--synapse/__init__.py2
5 files changed, 16 insertions, 3 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 490c2021e0..d8eba2ec60 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,12 @@
+Synapse 0.99.3.1 (2019-05-03)
+=============================
+
+Bugfixes
+--------
+
+- Switch to using a cryptographically-secure random number generator for token strings, ensuring they cannot be predicted by an attacker. Thanks to @opnsec for identifying and responsibly disclosing this issue! ([\#5133](https://github.com/matrix-org/synapse/issues/5133))
+- Blacklist 0.0.0.0 and :: by default for URL previews. Thanks to @opnsec for identifying and responsibly disclosing this issue too! ([\#5134](https://github.com/matrix-org/synapse/issues/5134))
+
 Synapse 0.99.3 (2019-04-01)
 ===========================
 
diff --git a/changelog.d/5133.bugfix b/changelog.d/5133.bugfix
deleted file mode 100644
index be6474a692..0000000000
--- a/changelog.d/5133.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Switch to using a cryptographically-secure random number generator for token strings, ensuring they cannot be predicted by an attacker. Thanks to @opnsec for identifying and responsibly disclosing this issue!
diff --git a/changelog.d/5134.bugfix b/changelog.d/5134.bugfix
deleted file mode 100644
index 684d48c53a..0000000000
--- a/changelog.d/5134.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Blacklist 0.0.0.0 and :: by default for URL previews. Thanks to @opnsec for identifying and responsibly disclosing this issue too!
diff --git a/debian/changelog b/debian/changelog
index 03df2e1c00..ea712f0dab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+matrix-synapse-py3 (0.99.3.1) stable; urgency=medium
+
+  * New synapse release 0.99.3.1.
+
+ -- Synapse Packaging team <packages@matrix.org>  Fri, 03 May 2019 16:02:43 +0100
+
 matrix-synapse-py3 (0.99.3) stable; urgency=medium
 
   [ Richard van der Hoff ]
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 6bb5a8b24d..8959312cb0 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.99.3"
+__version__ = "0.99.3.1"