am 6c08cd6a: Merge "Avoid leaking file descriptors"

* commit '6c08cd6aa7aee66b973ee4861237ad36560e0239':
  Avoid leaking file descriptors
tree: 7cbefe6e1f1e009ae2759ba500b4ecf94e643beb
  1. client/
  2. include/
  3. server/