From 69adb93d03199a9701953d2e911b30c9e93bbc29 Mon Sep 17 00:00:00 2001
From: james <james@e7ae566f-a301-0410-adde-c780ea21d3b5>
Date: Tue, 30 Mar 2010 04:20:55 +0000
Subject: Set socket buffers (SO_SNDBUF and SO_RCVBUF) immediately after socket
 is created rather than waiting until after connect/listen.

Version 2.1.1d


git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@5514 e7ae566f-a301-0410-adde-c780ea21d3b5
---
 version.m4 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/version.m4 b/version.m4
index 5723d3c..f9c399b 100644
--- a/version.m4
+++ b/version.m4
@@ -1,5 +1,6 @@
 dnl define the OpenVPN version
 define(PRODUCT_VERSION,[2.1.1g])
+>>>>>>> Set socket buffers (SO_SNDBUF and SO_RCVBUF) immediately after
 dnl define the TAP version
 define(PRODUCT_TAP_ID,[tap0901])
 define(PRODUCT_TAP_WIN32_MIN_MAJOR,[9])
-- 
cgit v1.2.3