]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Mon, 24 Nov 2014 14:19:22 +0000 (09:19 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 24 Nov 2014 14:19:22 +0000 (09:19 -0500)
commitb4ead16d57fab6a8294a0bf374bfcdb0d6e02625
tree49e95a412aba3ecf7e6845d271a780678e10a178
parent6218f489509d4bd4a4c96be200565bb6f0906108
parent5b55778c86b88329725521d2c93829a9c9ad3501
Merge remote-tracking branch 'origin/maint-0.2.5'