am 33fc60d6: am 7842cff8: am 787d8145: am 4a794846: Merge "Fix descriptor leak after accepting connections"

* commit '33fc60d64e82adeea7a9478be3a153a7c7ab9537':
  Fix descriptor leak after accepting connections