]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 43f4324 f6943d7)
Merge branch 'tor-github/pr/1898'
authorGeorge Kadianakis <desnacked@riseup.net>
Wed, 27 May 2020 12:17:55 +0000 (15:17 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Wed, 27 May 2020 12:17:55 +0000 (15:17 +0300)
1  2 
src/app/main/main.c patch | diff1 | diff2 | blob | history

diff --cc src/app/main/main.c
Simple merge
Mirror of https://git.torproject.org/tor.git