]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Mon, 21 Jul 2014 18:01:00 +0000 (14:01 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 21 Jul 2014 18:01:00 +0000 (14:01 -0400)
commite7e92fb2f9e45c18ac23c90efe2eb32cf3f4a953
tree3177460a8b9e482cea618499ca27a74a5a5c8eef
parenta36cd51b59f3fbd99041904ac5b963a296aabefb
parentfa8bb25f642a4fc57d44951d0192a26dd5a66c5b
Merge remote-tracking branch 'origin/maint-0.2.5'