Pull changes to fix getlantern/lantern#1895

Pull changes to fix getlantern/lantern#1895
If stop was concurrently requested, is any of the calls to stop guaranteed to return?  I guess they could be left waiting for this?