[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1634'

teor at torproject.org teor at torproject.org
Wed Jan 15 12:32:32 UTC 2020

commit d430b5a0749b4f1256b64e6d36ea684e9ba1cae8
Merge: b7cfca1de 54eec5342
Author: teor <teor at torproject.org>
Date:   Wed Jan 15 22:31:10 2020 +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.

More information about the tor-commits mailing list