merged fixes from RC_0_16

examples/client_test.cpp

@@ -1140,7 +1140,9 @@ int main(int argc, char* argv[])
 			"  -Q                    enables share mode. Share mode attempts to maximize\n"
 			"                        share ratio rather than downloading\n"
 			"  -r <IP:port>          connect to specified peer\n"
+#ifndef TORRENT_DISABLE_ENCRYPTION
 			"  -e                    force encrypted bittorrent connections\n"
+#endif
 			"\n QUEING OPTIONS\n"
 			"  -v <limit>            Set the max number of active downloads\n"
 			"  -^ <limit>            Set the max number of active seeds\n"
@@ -1308,6 +1310,7 @@ int main(int argc, char* argv[])
 			case 'F': refresh_delay = atoi(arg); break;
 			case 'H': start_dht = false; --i; break;
 			case 'l': settings.listen_queue_size = atoi(arg); break;
+#ifndef TORRENT_DISABLE_ENCRYPTION
 			case 'e':
 				{
 					pe_settings s;
@@ -1319,6 +1322,7 @@ int main(int argc, char* argv[])
 					ses.set_pe_settings(s);
 					break;
 				}
+#endif
 			case 'W':
 				settings.max_peerlist_size = atoi(arg);
 				settings.max_paused_peerlist_size = atoi(arg) / 2;