]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68e1ced acd27f4)
Merge branch 'maint-0.4.2'
authorteor <teor@torproject.org>
Thu, 24 Oct 2019 23:42:14 +0000 (09:42 +1000)
committerteor <teor@torproject.org>
Thu, 24 Oct 2019 23:42:14 +0000 (09:42 +1000)
1  2 
src/feature/hs/hs_client.c patch | diff1 | diff2 | blob | history

diff --cc src/feature/hs/hs_client.c
Simple merge
Mirror of https://git.torproject.org/tor.git