  long
  SSL_CTX_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void))
  {
-@@ -1236,6 +1900,22 @@
+@@ -1236,6 +1906,22 @@
   * preference.
   */
  STACK_OF(SSL_CIPHER) *

 SSL_set_quiet_shutdown(SSL *s, int mode)
 {
 	s->quiet_shutdown = mode;
@@ -2821,12 +3853,43 @@
 }
 
 void

 const char *
 SSL_get_servername(const SSL *s, const int type)
 {
@@ -1541,6 +2269,13 @@
  * OPENSSL_NPN_NO_OVERLAP if the fallback case was reached.
  */
 int
