]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a10948 7005046)
Merge branch 'tor-gitlab/mr/444'
authorDavid Goulet <dgoulet@torproject.org>
Mon, 4 Oct 2021 14:49:27 +0000 (10:49 -0400)
committerDavid Goulet <dgoulet@torproject.org>
Mon, 4 Oct 2021 14:49:27 +0000 (10:49 -0400)
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