Merge branch 'master' into develop

31 files changed, 64 insertions, 31 deletions

diff --git a/CHANGES.md b/CHANGES.md
index fb98c934c0..8302610585 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,66 @@
+Synapse 0.33.8 (2018-11-01)
+===========================
+
+No significant changes.
+
+
+Synapse 0.33.8rc2 (2018-10-31)
+==============================
+
+Bugfixes
+--------
+
+- Searches that request profile info now no longer fail with a 500. Fixes 
+  a regression in 0.33.8rc1. ([\#4122](https://github.com/matrix-org/synapse/issues/4122))
+
+
+Synapse 0.33.8rc1 (2018-10-29)
+==============================
+
+Features
+--------
+
+- Servers with auto-join rooms will now automatically create those rooms when the first user registers ([\#3975](https://github.com/matrix-org/synapse/issues/3975))
+- Add config option to control alias creation ([\#4051](https://github.com/matrix-org/synapse/issues/4051))
+- The register_new_matrix_user script is now ported to Python 3. ([\#4085](https://github.com/matrix-org/synapse/issues/4085))
+- Configure Docker image to listen on both ipv4 and ipv6. ([\#4089](https://github.com/matrix-org/synapse/issues/4089))
+
+
+Bugfixes
+--------
+
+- Fix HTTP error response codes for federated group requests. ([\#3969](https://github.com/matrix-org/synapse/issues/3969))
+- Fix issue where Python 3 users couldn't paginate /publicRooms ([\#4046](https://github.com/matrix-org/synapse/issues/4046))
+- Fix URL previewing to work in Python 3.7 ([\#4050](https://github.com/matrix-org/synapse/issues/4050))
+- synctl will use the right python executable to run worker processes ([\#4057](https://github.com/matrix-org/synapse/issues/4057))
+- Manhole now works again on Python 3, instead of failing with a "couldn't match all kex parts" when connecting. ([\#4060](https://github.com/matrix-org/synapse/issues/4060), [\#4067](https://github.com/matrix-org/synapse/issues/4067))
+- Fix some metrics being racy and causing exceptions when polled by Prometheus. ([\#4061](https://github.com/matrix-org/synapse/issues/4061))
+- Fix bug which prevented email notifications from being sent unless an absolute path was given for `email_templates`. ([\#4068](https://github.com/matrix-org/synapse/issues/4068))
+- Correctly account for cpu usage by background threads ([\#4074](https://github.com/matrix-org/synapse/issues/4074))
+- Fix race condition where config defined reserved users were not being added to
+  the monthly active user list prior to the homeserver reactor firing up ([\#4081](https://github.com/matrix-org/synapse/issues/4081))
+- Fix bug which prevented backslashes being used in event field filters ([\#4083](https://github.com/matrix-org/synapse/issues/4083))
+
+
+Internal Changes
+----------------
+
+- Add information about the [matrix-docker-ansible-deploy](https://github.com/spantaleev/matrix-docker-ansible-deploy) playbook ([\#3698](https://github.com/matrix-org/synapse/issues/3698))
+- Add initial implementation of new state resolution algorithm ([\#3786](https://github.com/matrix-org/synapse/issues/3786))
+- Reduce database load when fetching state groups ([\#4011](https://github.com/matrix-org/synapse/issues/4011))
+- Various cleanups in the federation client code ([\#4031](https://github.com/matrix-org/synapse/issues/4031))
+- Run the CircleCI builds in docker containers ([\#4041](https://github.com/matrix-org/synapse/issues/4041))
+- Only colourise synctl output when attached to tty ([\#4049](https://github.com/matrix-org/synapse/issues/4049))
+- Refactor room alias creation code ([\#4063](https://github.com/matrix-org/synapse/issues/4063))
+- Make the Python scripts in the top-level scripts folders meet pep8 and pass flake8. ([\#4068](https://github.com/matrix-org/synapse/issues/4068))
+- The README now contains example for the Caddy web server. Contributed by steamp0rt. ([\#4072](https://github.com/matrix-org/synapse/issues/4072))
+- Add psutil as an explicit dependency ([\#4073](https://github.com/matrix-org/synapse/issues/4073))
+- Clean up threading and logcontexts in pushers ([\#4075](https://github.com/matrix-org/synapse/issues/4075))
+- Correctly manage logcontexts during startup to fix some "Unexpected logging context" warnings ([\#4076](https://github.com/matrix-org/synapse/issues/4076))
+- Give some more things logcontexts ([\#4077](https://github.com/matrix-org/synapse/issues/4077))
+- Clean up some bits of code which were flagged by the linter ([\#4082](https://github.com/matrix-org/synapse/issues/4082))
+
+
 Synapse 0.33.7 (2018-10-18)
 ===========================
 
diff --git a/changelog.d/3698.misc b/changelog.d/3698.misc
deleted file mode 100644
index 12537e76f2..0000000000
--- a/changelog.d/3698.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add information about the [matrix-docker-ansible-deploy](https://github.com/spantaleev/matrix-docker-ansible-deploy) playbook
diff --git a/changelog.d/3786.misc b/changelog.d/3786.misc
deleted file mode 100644
index a9f9a2bb27..0000000000
--- a/changelog.d/3786.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add initial implementation of new state resolution algorithm
diff --git a/changelog.d/3969.bugfix b/changelog.d/3969.bugfix
deleted file mode 100644
index ca2759e91e..0000000000
--- a/changelog.d/3969.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix HTTP error response codes for federated group requests.
diff --git a/changelog.d/3975.feature b/changelog.d/3975.feature
deleted file mode 100644
index 162f30a532..0000000000
--- a/changelog.d/3975.feature
+++ /dev/null
@@ -1 +0,0 @@
-Servers with auto-join rooms will now automatically create those rooms when the first user registers
diff --git a/changelog.d/4011.misc b/changelog.d/4011.misc
deleted file mode 100644
index ad7768c4cd..0000000000
--- a/changelog.d/4011.misc
+++ /dev/null
@@ -1 +0,0 @@
-Reduce database load when fetching state groups
diff --git a/changelog.d/4031.misc b/changelog.d/4031.misc
deleted file mode 100644
index 60be8b59fd..0000000000
--- a/changelog.d/4031.misc
+++ /dev/null
@@ -1 +0,0 @@
-Various cleanups in the federation client code
diff --git a/changelog.d/4041.misc b/changelog.d/4041.misc
deleted file mode 100644
index 8cce9daac9..0000000000
--- a/changelog.d/4041.misc
+++ /dev/null
@@ -1 +0,0 @@
-Run the CircleCI builds in docker containers
diff --git a/changelog.d/4046.bugfix b/changelog.d/4046.bugfix
deleted file mode 100644
index 5046dd1ce3..0000000000
--- a/changelog.d/4046.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix issue where Python 3 users couldn't paginate /publicRooms
diff --git a/changelog.d/4049.misc b/changelog.d/4049.misc
deleted file mode 100644
index 4370d9dfa6..0000000000
--- a/changelog.d/4049.misc
+++ /dev/null
@@ -1 +0,0 @@
-Only colourise synctl output when attached to tty
diff --git a/changelog.d/4050.bugfix b/changelog.d/4050.bugfix
deleted file mode 100644
index 3d1f6af847..0000000000
--- a/changelog.d/4050.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix URL priewing to work in Python 3.7
diff --git a/changelog.d/4051.feature b/changelog.d/4051.feature
deleted file mode 100644
index 9c1b3a72a0..0000000000
--- a/changelog.d/4051.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add config option to control alias creation
diff --git a/changelog.d/4057.bugfix b/changelog.d/4057.bugfix
deleted file mode 100644
index 7577731255..0000000000
--- a/changelog.d/4057.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-synctl will use the right python executable to run worker processes
\ No newline at end of file
diff --git a/changelog.d/4060.bugfix b/changelog.d/4060.bugfix
deleted file mode 100644
index 78d69a8819..0000000000
--- a/changelog.d/4060.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Manhole now works again on Python 3, instead of failing with a "couldn't match all kex parts" when connecting.
diff --git a/changelog.d/4061.bugfix b/changelog.d/4061.bugfix
deleted file mode 100644
index 94ffcf7a51..0000000000
--- a/changelog.d/4061.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix some metrics being racy and causing exceptions when polled by Prometheus.
diff --git a/changelog.d/4063.misc b/changelog.d/4063.misc
deleted file mode 100644
index 677fcb90ad..0000000000
--- a/changelog.d/4063.misc
+++ /dev/null
@@ -1 +0,0 @@
-Refactor room alias creation code
diff --git a/changelog.d/4067.bugfix b/changelog.d/4067.bugfix
deleted file mode 100644
index 78d69a8819..0000000000
--- a/changelog.d/4067.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Manhole now works again on Python 3, instead of failing with a "couldn't match all kex parts" when connecting.
diff --git a/changelog.d/4068.bugfix b/changelog.d/4068.bugfix
deleted file mode 100644
index 74bda7491f..0000000000
--- a/changelog.d/4068.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug which prevented email notifications from being sent unless an absolute path was given for `email_templates`.
\ No newline at end of file
diff --git a/changelog.d/4068.misc b/changelog.d/4068.misc
deleted file mode 100644
index db6c4ade59..0000000000
--- a/changelog.d/4068.misc
+++ /dev/null
@@ -1 +0,0 @@
-Make the Python scripts in the top-level scripts folders meet pep8 and pass flake8.
diff --git a/changelog.d/4072.misc b/changelog.d/4072.misc
deleted file mode 100644
index 9d7279fd2b..0000000000
--- a/changelog.d/4072.misc
+++ /dev/null
@@ -1 +0,0 @@
-The README now contains example for the Caddy web server. Contributed by steamp0rt.
diff --git a/changelog.d/4073.misc b/changelog.d/4073.misc
deleted file mode 100644
index fc304bef06..0000000000
--- a/changelog.d/4073.misc
+++ /dev/null
@@ -1 +0,0 @@
-Add psutil as an explicit dependency
diff --git a/changelog.d/4074.bugfix b/changelog.d/4074.bugfix
deleted file mode 100644
index b3b6b00243..0000000000
--- a/changelog.d/4074.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Correctly account for cpu usage by background threads
diff --git a/changelog.d/4075.misc b/changelog.d/4075.misc
deleted file mode 100644
index d08b8cc271..0000000000
--- a/changelog.d/4075.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up threading and logcontexts in pushers
\ No newline at end of file
diff --git a/changelog.d/4076.misc b/changelog.d/4076.misc
deleted file mode 100644
index 9dd000decf..0000000000
--- a/changelog.d/4076.misc
+++ /dev/null
@@ -1 +0,0 @@
-Correctly manage logcontexts during startup to fix some "Unexpected logging context" warnings
\ No newline at end of file
diff --git a/changelog.d/4077.misc b/changelog.d/4077.misc
deleted file mode 100644
index 52ca4c1de2..0000000000
--- a/changelog.d/4077.misc
+++ /dev/null
@@ -1 +0,0 @@
-Give some more things logcontexts
diff --git a/changelog.d/4081.bugfix b/changelog.d/4081.bugfix
deleted file mode 100644
index cfe4b3e9d9..0000000000
--- a/changelog.d/4081.bugfix
+++ /dev/null
@@ -1,2 +0,0 @@
-Fix race condition where config defined reserved users were not being added to
-the monthly active user list prior to the homeserver reactor firing up
diff --git a/changelog.d/4082.misc b/changelog.d/4082.misc
deleted file mode 100644
index a81faf5e9b..0000000000
--- a/changelog.d/4082.misc
+++ /dev/null
@@ -1 +0,0 @@
-Clean up some bits of code which were flagged by the linter
diff --git a/changelog.d/4083.bugfix b/changelog.d/4083.bugfix
deleted file mode 100644
index b3b08cdfa6..0000000000
--- a/changelog.d/4083.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix bug which prevented backslashes being used in event field filters
\ No newline at end of file
diff --git a/changelog.d/4085.feature b/changelog.d/4085.feature
deleted file mode 100644
index 4bd3ddcf2c..0000000000
--- a/changelog.d/4085.feature
+++ /dev/null
@@ -1 +0,0 @@
-The register_new_matrix_user script is now ported to Python 3.
diff --git a/changelog.d/4089.feature b/changelog.d/4089.feature
deleted file mode 100644
index 62c9d839bb..0000000000
--- a/changelog.d/4089.feature
+++ /dev/null
@@ -1 +0,0 @@
- Configure Docker image to listen on both ipv4 and ipv6.
diff --git a/synapse/__init__.py b/synapse/__init__.py
index 1ddbbbebfb..89ea9a9775 100644
--- a/synapse/__init__.py
+++ b/synapse/__init__.py
@@ -27,4 +27,4 @@ try:
 except ImportError:
     pass
 
-__version__ = "0.33.7"
+__version__ = "0.33.8"