[tor-commits] [flashproxy/master] Post-hoc ChangeLog for the facilitator part of #9349.

[dcf at torproject.org]

commit 1527cd97c9120e6cc857c13cf73f3f28beef1d1e
Author: David Fifield <david at bamsoftware.com>
Date:   Sat Nov 9 23:51:26 2013 -0800

    Post-hoc ChangeLog for the facilitator part of #9349.
---
 ChangeLog |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index f90579e..15c61f7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,12 @@ Changes in version 1.4
     assign proxies to clients that use matching transports. Patch by
     George Kadianakis. Part of bug 9349.
 
+  o Allowed the facilitator to handle layered transports. For example, a
+    client that register with the transport "obfs3|websocket" will
+    receive a connection from a proxy using websocket, and will be
+    connected to a relay that has an obfs3 server behind a websocket
+    front end. Patch by Ximin Luo and George Kadianakis. Fixes bug 9349.
+
   o Changed to use the pluggable transport method name "flashproxy"
     rather than "websocket". Both names are equivalent and "websocket"
     continues to work. The reason for this change is to reduce confusion