db2966 Rebase to 3.1.2 version

Authored and Committed by mschorm a year ago
    Rebase to 3.1.2 version
    Disabling the ED25519 plugin
    Plugindir patch upstreamed
    
        
file modified
+1 -0
file modified
+12 -9
file removed
-21
file modified
+1 -1