From 2f0a0e71b4c353999ba73f94555f5244130e3490 Mon Sep 17 00:00:00 2001
From: bluhm <bluhm@openbsd.org>
Date: Tue, 13 Jan 2015 14:09:54 +0000
Subject: [PATCH] Document the openssl s_client -proxy feature. OK jmc@

---
 usr.bin/openssl/openssl.1 | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/usr.bin/openssl/openssl.1 b/usr.bin/openssl/openssl.1
index d139d13231a..a2d62ed1e0d 100644
--- a/usr.bin/openssl/openssl.1
+++ b/usr.bin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.10 2015/01/05 03:54:55 lteo Exp $
+.\" $OpenBSD: openssl.1,v 1.11 2015/01/13 14:09:54 bluhm Exp $
 .\" ====================================================================
 .\" Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
 .\"
@@ -112,7 +112,7 @@
 .\"
 .\" OPENSSL
 .\"
-.Dd $Mdocdate: January 5 2015 $
+.Dd $Mdocdate: January 13 2015 $
 .Dt OPENSSL 1
 .Os
 .Sh NAME
@@ -6485,6 +6485,7 @@ which it can be seen agrees with the recovered value above.
 .Op Fl pause
 .Op Fl policy_check
 .Op Fl prexit
+.Op Fl proxy Ar host : Ns Ar port
 .Op Fl psk Ar key
 .Op Fl psk_identity Ar identity
 .Op Fl quiet
@@ -6628,6 +6629,17 @@ requested only after an attempt is made to access a certain URL.
 .Sy Note :
 the output produced by this option is not always accurate because a
 connection might never have been established.
+.It Fl proxy Ar host : Ns Ar port
+Use the HTTP proxy at
+.Ar host
+and
+.Ar port .
+The connection to the proxy is done in cleartext and the
+.Fl connect
+argument is given to the proxy.
+If not specified, localhost is used as final destination.
+After that, switch the connection through the proxy to the destination
+to TLS.
 .It Fl psk Ar key
 Use the PSK key
 .Ar key
-- 
2.20.1