]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f06d9a9 ad95d64)
Merge branch 'maint-0.2.4' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Thu, 11 Feb 2016 17:55:40 +0000 (12:55 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 11 Feb 2016 17:55:40 +0000 (12:55 -0500)
1  2 
src/common/container.c patch | diff1 | diff2 | blob | history

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