Merge "Add missing <malloc.h> include."
tree: ff066b7580f43ff9f5377f9efa762731cec10b62
  1. client/
  2. include/
  3. server/