]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Fri, 29 Aug 2014 20:45:56 +0000 (16:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 29 Aug 2014 20:45:56 +0000 (16:45 -0400)
commitf113a263deda8e1619f46cd913fc24ac28da832d
tree367b7c8e31b427a1fd83af5cd06daf3217806ede
parentd6fa8239c86f49413e9ee86765059f43ceeb06c6
parent41058dce95b4e94c10b156728524d24d69620ed0
Merge remote-tracking branch 'origin/maint-0.2.5'