]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a30f17f cb10727)
Merge branch 'tor-github/pr/675'
authorDavid Goulet <dgoulet@torproject.org>
Wed, 20 Feb 2019 16:45:58 +0000 (11:45 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Wed, 20 Feb 2019 16:45:58 +0000 (11:45 -0500)
1  2 
src/app/config/config.c patch | diff1 | diff2 | blob | history

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