]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8386cc 6d8a2ff)
Merge remote-tracking branch 'teor/bug16115-minor-fixes'
authorNick Mathewson <nickm@torproject.org>
Tue, 2 Jun 2015 18:51:13 +0000 (14:51 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 2 Jun 2015 18:51:13 +0000 (14:51 -0400)
1  2 
src/common/tortls.c patch | diff1 | diff2 | blob | history

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