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>

1 files changed, 1 insertions, 1 deletions

diff --git a/socket.c b/socket.c
index 8f9d17d..b02d3da 100644
--- a/socket.c
+++ b/socket.c
@@ -231,7 +231,7 @@ getaddr_multi (unsigned int flags,
 		   n);
 
 	      /* choose address randomly, for basic load-balancing capability */
-	      /*ia.s_addr = *(in_addr_t *) (h->h_addr_list[get_random () % n]);*
+	      /*ia.s_addr = *(in_addr_t *) (h->h_addr_list[get_random () % n]);*/
 
 	      /* choose first address */
 	      ia.s_addr = *(in_addr_t *) (h->h_addr_list[0]);