Merge "tombstoned: fix another call to evconnlistener_new." am: baea76dba7
am: 6d0d6c34cd

Change-Id: I3473abcea7d65a5477639b5ddcec4fe794975cc1