]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b7cfca1 54eec53)
Merge remote-tracking branch 'tor-github/pr/1634'
authorteor <teor@torproject.org>
Wed, 15 Jan 2020 12:31:10 +0000 (22:31 +1000)
committerteor <teor@torproject.org>
Wed, 15 Jan 2020 12:31:10 +0000 (22:31 +1000)
"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.


Trivial merge
Mirror of https://git.torproject.org/tor.git