Merge branch 'maint'

To get the single fix that was just merged to maint.

* maint:
  server: Fix memory leak at exit.

diff --cc server.c
Simple merge