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

Change-Id: I37f27333ea52881056b04341699c671244ab0835