(try to) resolve merge conflict

CHANGELOG.md

@@ -1,11 +1,19 @@
 
 ## Change Log
 
-### Features implemented / improvements in 3.1
+### Features implemented / improvements in 3.1dev
-* Renamed PFS into FS
+
+* Extend Server (cipher) preference: always now in wide mode instead of running all ciphers in the end (per default)
+* Improved compatibility with OpenSSL 3.0
+* Renamed PFS/perfect forward secrecy --> FS/forward secrecy
 * Improved mass testing
+* Align better colors of ciphers with standard cipherlists
+* Added several ciphers to colored ciphers
+* Percent output char problem fixed
+* Several display/output fixes
 * Security fix: DNS input
-* Rating
+* Don't use external pwd anymore
+* Rating (via SSL Labs)
 
 ### Features implemented / improvements in 3.0
 

doc/testssl.1.md

@@ -40,9 +40,9 @@ linked OpenSSL binaries for major operating systems are supplied in `./bin/`.
 
 1) SSL/TLS protocol check
 
-2) standard cipher categories to give you upfront an idea for the ciphers supported
+2) checks forward secrecy: ciphers and elliptical curves
 
-3) checks forward secrecy: ciphers and elliptical curves
+3) standard cipher categories to give you upfront an idea for the ciphers supported
 
 4) server preferences (server order)
 
@@ -54,9 +54,9 @@ linked OpenSSL binaries for major operating systems are supplied in `./bin/`.
 
 8) testing each of 370 preconfigured ciphers
 
-9) client simulation
+8) client simulation
 
-10) Result of script in form of a grade
+9) Result of script in form of a grade
 
 
 ## OPTIONS AND PARAMETERS