]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge branch 'maint-0.2.4' into maint-0.2.5
authorRoger Dingledine <arma@torproject.org>
Mon, 28 Jul 2014 08:09:37 +0000 (04:09 -0400)
committerRoger Dingledine <arma@torproject.org>
Mon, 28 Jul 2014 08:09:37 +0000 (04:09 -0400)
commit4467e5ce56e657e6063c77b8399a30416084b0da
tree4a5c99918cc77aca7a21696f6b62f8c00f567e4c
parent29a82b5a8b6d5e75a1f8b880933c2a232458d386
parentfcbb21b414947d8ad7e4298d3952b84d8005dabc
Merge branch 'maint-0.2.4' into maint-0.2.5