]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
projects / thirdparty / tor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bbad23b ba17cdf)
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Sun, 18 Jan 2015 18:49:04 +0000 (13:49 -0500)
committerNick Mathewson <nickm@torproject.org>
Sun, 18 Jan 2015 18:49:04 +0000 (13:49 -0500)
Conflicts:
src/test/test_relaycell.c
src/test/test_util.c


Trivial merge
Mirror of https://git.torproject.org/tor.git