Merge branch 'master' into getopt
authorChristian Grothoff <christian@grothoff.org>
Fri, 17 Mar 2017 10:53:24 +0000 (11:53 +0100)
committerChristian Grothoff <christian@grothoff.org>
Fri, 17 Mar 2017 10:53:24 +0000 (11:53 +0100)
commitc253a40bae417335fab8446f3c7182c8c5d4833f
tree0517ab35f90bf290744e5a9ddfeb75ca9547cdbe
parent273188e646ed4d91ced1dac443e976336be877b4
parent79fb947eb8fba243ea65e19b40b65e04f8806865
Merge branch 'master' into getopt
src/transport/tcp_service_legacy.c