Convert the asio server from a weird example server to a generic proxy server.

2 files changed, 7 insertions, 8 deletions

diff --git a/doc/manual/tls.rst b/doc/manual/tls.rst
index b3ec1c0ea..1b7929f1b 100644
--- a/doc/manual/tls.rst
+++ b/doc/manual/tls.rst
@@ -269,9 +269,7 @@ TLS Clients
    resized as needed to process inputs). Otherwise some reasonable
    default is used.
 
-A simple TLS client example:
-
-.. literalinclude:: ../../src/cmd/tls_client.cpp
+A TLS client example using BSD sockets is in `src/cmd/tls_client.cpp`
 
 TLS Servers
 ----------------------------------------
@@ -309,10 +307,8 @@ not until they actually receive a hello without this parameter.
    renegotiation, but might change across different connections using
    that session.
 
-An example TLS server that can handle concurrent connections using
-asio follows:
-
-.. literalinclude:: ../../src/cmd/tls_server_asio.cpp
+An example TLS server implementation using asio is available in
+`src/cmd/tls_proxy.cpp`.
 
 .. _tls_sessions:
 
diff --git a/doc/relnotes/1_11_13.rst b/doc/relnotes/1_11_13.rst
index 8a9ed5872..d0ca04245 100644
--- a/doc/relnotes/1_11_13.rst
+++ b/doc/relnotes/1_11_13.rst
@@ -1,6 +1,9 @@
 Version 1.11.13, Not Yet Released
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+* The command line tool now has `tls_proxy` which negotiates TLS with
+  clients and forwards the plaintext to a specified port.
+
 * Add MCEIES, a McEliece-based integrated encryption system using
   AES-256 in OCB mode for message encryption/authentication.
 
@@ -9,7 +12,7 @@ Version 1.11.13, Not Yet Released
 * Add SHA-512/256
 
 * The format of serialized TLS sessions has changed. Additiionally, PEM
-  formatted sessions now use the label of "TLS SESSION" instead of "SSL SESSION".
+  formatted sessions now use the label of "TLS SESSION" instead of "SSL SESSION"
 
 * Serialized TLS sessions are now encrypted using AES-256/GCM instead of a
   CBC+HMAC construction.