From: teor <teor@torproject.org>
Date: Wed, 15 Jan 2020 12:31:10 +0000 (+1000)
Subject: Merge remote-tracking branch 'tor-github/pr/1634'
X-Git-Tag: tor-0.4.3.1-alpha~25
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d430b5a0749b4f1256b64e6d36ea684e9ba1cae8;p=thirdparty%2Ftor.git

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.
---

d430b5a0749b4f1256b64e6d36ea684e9ba1cae8