Merge branch 'bug14451_026_v1'

2 files changed, 12 insertions, 2 deletions

diff --git a/changes/bug12585 b/changes/bug12585
index 495a2f0d71..ac03993916 100644
--- a/changes/bug12585
+++ b/changes/bug12585
@@ -1,9 +1,12 @@
   o Major features (security)
-    - Implementation of SocksSocket option - SocksSocket implements a SOCKS
+    - Implementation of an AF_UNIX socket  option to implement a SOCKS
       proxy reachable by Unix Domain Socket. This allows client applications to
       communicate with Tor without having the ability to create AF_INET or
       AF_INET6 family sockets. If an application has permission to create a socket
       with AF_UNIX, it may directly communicate with Tor as if it were an other
       SOCKS proxy. This should allow high risk applications to be entirely prevented
       from connecting directly with TCP/IP, they will be able to only connect to the
-      internet through AF_UNIX and only through Tor.  Closes ticket 12585.
+      internet through AF_UNIX and only through Tor.
+      To create a socket of this type, use the syntax "unix:/path/to/socket".
+      Closes ticket 12585.
+
diff --git a/changes/bug14451 b/changes/bug14451
new file mode 100644
index 0000000000..7949a78070
--- /dev/null
+++ b/changes/bug14451
@@ -0,0 +1,7 @@
+
+
+  o Minor features:
+    - ControlPort now supports the unix:/path/to/dir syntax as an alternative
+      to the ControlSocket option, for consistency with SocksPort and
+      hidden services.  Closes ticket 14451.
+