diff --git a/changes/bug3936 b/changes/bug3936
new file mode 100644
index 0000000000..55b13c0092
--- /dev/null
+++ b/changes/bug3936
@@ -0,0 +1,5 @@
+  o Major bugfixes:
+    - Fix a bug where the SocksPort option (for example) would get
+      ignored and replaced by the default if a SocksListenAddress option
+      was set. Bugfix on 0.2.3.3-alpha; fixes bug 3936. Fix by Fabian Keil.
+