Merge branch 'svn-BETA21' into beta2.2

Conflicts:
	openvpn.8
	- Enhancements to the --register-dns description
	ssl.h
 	- Community changed n_packets and n_bytes to use
          counter_type instead of int to avoid integer overflows
	  (commit 6484c6299cf298107316e6497)

Signed-off-by: David Sommerseth <dazo@users.sourceforge.net>

diff --cc openvpn.8
index 3ad232a3d6061b196ce690d9b91c0ac9db02917c,53aabdc1f7ac5a698978fe5240b399ceff764429..54fe720b6c06f61f24654c80cf873aecae3147dc
--- 1/openvpn.8
--- 2/openvpn.8
+++ b/openvpn.8
@@@ -4762,9 -4749,10 +4762,10 @@@ This option has the same caveats a
  above.
  .\"*********************************************************
  .TP
 -.B --register-dns
 +.B \-\-register-dns
- Run ipconfig /flushdns and ipconfig /registerdns on
- connection initiation.  This is known to kick Windows into
+ Run net stop dnscache, net start dnscache, ipconfig /flushdns
+ and ipconfig /registerdns on connection initiation.
+ This is known to kick Windows into
  recognizing pushed DNS servers.
  .\"*********************************************************
  .TP

diff --cc options.c
Simple merge

diff --cc socket.c
Simple merge

diff --cc ssl.c
Simple merge

diff --cc ssl.h
index 02234c39323a14b3ebd6999aa6a05798df4c81c2,c6a5627f0296b02497278795a268e5b49f88fb01..8415d5555908ecbf9c7779106e6a452f082e488a
--- 1/ssl.h
--- 2/ssl.h
+++ b/ssl.h
@@@ -379,8 -376,10 +379,10 @@@ struct key_stat
    struct reliable *rec_reliable;  /* order incoming ciphertext packets before we pass to TLS */
    struct reliable_ack *rec_ack;         /* buffers all packet IDs we want to ACK back to sender */
  
 -  int n_bytes;                         /* how many bytes sent/recvd since last key exchange */
 -  int n_packets;               /* how many packets sent/recvd since last key exchange */
+   struct buffer_list *paybuf;
+ 
 +  counter_type n_bytes;                /* how many bytes sent/recvd since last key exchange */
 +  counter_type n_packets;      /* how many packets sent/recvd since last key exchange */
  
    /*
     * If bad username/password, TLS connection will come up but 'authenticated' will be false.

diff --cc syshead.h
Simple merge

diff --cc tun.c
Simple merge