Merge "tombstoned: fix another call to evconnlistener_new." am: baea76dba7 am: 6d0d6c34cd am: 5d0e0fbdbb
am: 6014a15e7b

Change-Id: Ic43694111da612278e50b426efab44a4c4aaea0b