Merge.

diff --cc ChangeLog
index 37b607342e7e0d9204ed39bfecf38dafa58986da,627070f12f7d55484ba6c3f94f909bb1544aad5f..3c7e25e910b7fba18d245f60ad672b858632f3ff
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,11 @@@
  2018-01-07  Carl Hetherington  <cth@carlh.net>
  
 +      * Updated nl_NL translation from Rob van Nieuwkerk.
 +
+       * Version 2.11.38 released.
+ 
+ 2018-01-07  Carl Hetherington  <cth@carlh.net>
+ 
        * Make certificate re-creation cancellable and default nags
        to not going away (#1158).