Merge in latest changes from 0.9.6-stable.

make update
perl util/mkerr.pl -recurse -write -rebuild

(now, just look at the effect that last thing had on the ENGINE error
strings!  How did that unbalance between macros and strings happen?)

crypto/buffer/buffer.h

@@ -81,6 +81,7 @@ void ERR_load_BUF_strings(void );
 /* The following lines are auto generated by the script mkerr.pl. Any changes
  * made after this point may be overwritten when the script is next run.
  */
+void ERR_load_BUF_strings(void);
 
 /* Error codes for the BUF functions. */
 
@@ -95,4 +96,3 @@ void ERR_load_BUF_strings(void );
 }
 #endif
 #endif
-