Small corrections

Author: papafe

src/MongoDB.Driver/ClusterRegistry.cs

@@ -166,7 +166,7 @@ private TcpStreamSettings ConfigureTcp(TcpStreamSettings settings, ClusterKey cl
                 settings = settings.With(addressFamily: AddressFamily.InterNetworkV6);
             }
 
-            return settings.With(
+            return settings.WithSocks5Settings(
                 connectTimeout: clusterKey.ConnectTimeout,
                 readTimeout: clusterKey.SocketTimeout,
                 receiveBufferSize: clusterKey.ReceiveBufferSize,

src/MongoDB.Driver/Core/Configuration/ClusterBuilderExtensions.cs

@@ -121,7 +121,7 @@ public static ClusterBuilder ConfigureWithConnectionString(
 
             if (connectionString.ProxyHost != null)
             {
-                builder = builder.ConfigureTcp(s => s.With(
+                builder = builder.ConfigureTcp(s => s.WithSocks5Settings(
                     socks5ProxySettings: Socks5ProxySettings.Create(
                         connectionString.ProxyHost,
                         connectionString.ProxyPort,

src/MongoDB.Driver/Core/Configuration/TcpStreamSettings.cs

@@ -206,16 +206,15 @@ public TcpStreamSettings With(
             Optional<int> sendBufferSize = default(Optional<int>),
             Optional<Action<Socket>> socketConfigurator = default(Optional<Action<Socket>>),
             Optional<TimeSpan?> writeTimeout = default(Optional<TimeSpan?>))
-        {
-            return new TcpStreamSettings(
-                addressFamily: addressFamily.WithDefault(_addressFamily),
-                connectTimeout: connectTimeout.WithDefault(_connectTimeout),
-                readTimeout: readTimeout.WithDefault(_readTimeout),
-                receiveBufferSize: receiveBufferSize.WithDefault(_receiveBufferSize),
-                sendBufferSize: sendBufferSize.WithDefault(_sendBufferSize),
-                socketConfigurator: socketConfigurator.WithDefault(_socketConfigurator),
-                writeTimeout: writeTimeout.WithDefault(_writeTimeout));
-        }
+        => WithSocks5Settings(
+            addressFamily: addressFamily,
+            connectTimeout: connectTimeout,
+            readTimeout: readTimeout,
+            receiveBufferSize: receiveBufferSize,
+            sendBufferSize: sendBufferSize,
+            socketConfigurator: socketConfigurator,
+            writeTimeout: writeTimeout,
+            socks5ProxySettings: _socks5ProxySettings);
 
         /// <summary>
         /// Returns a new TcpStreamSettings instance with some settings changed.