]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7d9d769 49c758a)
Merge branch 'maint-0.4.5' into maint-0.4.6
authorDavid Goulet <dgoulet@torproject.org>
Tue, 18 Jan 2022 18:15:29 +0000 (13:15 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 18 Jan 2022 18:15:29 +0000 (13:15 -0500)
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