]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da42353 b552547)
Merge remote-tracking branch 'dgoulet/bug14224_025_v1'
authorNick Mathewson <nickm@torproject.org>
Tue, 20 Jan 2015 19:02:07 +0000 (14:02 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 20 Jan 2015 19:02:07 +0000 (14:02 -0500)
1  2 
src/or/rendclient.c patch | diff1 | diff2 | blob | history

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