Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/mLib

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/mLib:
  Release 2.2.5.
  sel/ident.c: Don't close the descriptor twice on immediate connect failure.

diff --cc debian/changelog
index fa10942,0794729..c815542
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,9 +1,20 @@@
 +mlib (2.3.0) experimental; urgency=medium
 +
 +  * url: Always encode whitespace characters.  Particularly egregiously,
 +    mLib used to leave linefeeds unescaped in `lax' mode.
 +  * bits: Document the many improvements since the original version nearly
 +    20 years ago.
 +  * bits: Add macros for byte-swapping integers in-place.
 +  * bits: Use compiler intrinsics where available.
 +
 + -- Mark Wooding <mdw@distorted.org.uk>  Tue, 12 Jun 2018 00:30:47 +0100
 +
+ mlib (2.2.5) experimental; urgency=medium
+ 
+   * ident: Only close the socket once if connection fails early.
+ 
+  -- Mark Wooding <mdw@distorted.org.uk>  Sat, 09 Jun 2018 17:40:21 +0100
+ 
  mlib (2.2.4) experimental; urgency=medium
  
    * debian: Update for Debhelper 9.