]> git.ipfire.org Git - thirdparty/tor.git/commit
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)
commitdcf8cddab25e5b189eaebf473423c2b31acb4525
treebd9b72b479bc18fb0a2e7d1a2f22e4c389a32d18
parentbbad23bf37da8d453b8aa3fbfa19c39ec62150c6
parentba17cdfb0a80c5f6e86eb7b6e510eb72a9352b83
Merge remote-tracking branch 'origin/maint-0.2.5'

Conflicts:
src/test/test_relaycell.c
src/test/test_util.c