summaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-26 23:46:30 +0000
committerjames <james@e7ae566f-a301-0410-adde-c780ea21d3b5>2005-10-26 23:46:30 +0000
commitba3ff466e8c42b4f22a445106554e46ae86463ac (patch)
tree9111e5840ce92df376d1420d2ee9e91f971311a2 /ChangeLog
parentdfb4b0fa748a3d95434b9946d88801cc0f45ca42 (diff)
downloadopenvpn-ba3ff466e8c42b4f22a445106554e46ae86463ac.tar.gz
openvpn-ba3ff466e8c42b4f22a445106554e46ae86463ac.tar.xz
openvpn-ba3ff466e8c42b4f22a445106554e46ae86463ac.zip
svn merge -r 672:731 $SO/trunk/openvpn
Merged multi.c:1586 assertion fix attempt from trunk. git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@732 e7ae566f-a301-0410-adde-c780ea21d3b5
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 476dcdf..edfc588 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,7 +5,12 @@ $Id$
2005.10.xx -- Version 2.1-beta5
+* Fix attempt of assertion at multi.c:1586 (note that
+ this precise line number will vary across different
+ versions of OpenVPN).
* More PKCS#11 additions/changes (Alon Bar-Lev).
+* Added ".PHONY: plugin" to Makefile.am to work around
+ "make dist" issue.
* Fixed double fork issue that occurs when --management-hold
is used.
* Moved TUN/TAP read/write log messages from --verb 8 to 6.