commit d430b5a0749b4f1256b64e6d36ea684e9ba1cae8 parent b7cfca1dee4d4435f87c2e7b7233f51a956c56ee Author: teor <teor@torproject.org> Date: Wed, 15 Jan 2020 22:31:10 +1000 Merge remote-tracking branch 'tor-github/pr/1634' "Ours" merge, because ticket 32883 replaces this code with calls to tor_run_main(). (Which then calls the pubsub functions.) Therefore, this PR is obsolete in master, but it still needs to be merged, to avoid conflicts during any future backport.
