]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.5'
authorNick Mathewson <nickm@torproject.org>
Thu, 17 Jul 2014 09:34:33 +0000 (11:34 +0200)
committerNick Mathewson <nickm@torproject.org>
Thu, 17 Jul 2014 09:34:33 +0000 (11:34 +0200)
commita36cd51b59f3fbd99041904ac5b963a296aabefb
treeeec9e6ba6391c9c492aa305e021eb0003d2eeeee
parent7259e3f6049c7a644cb1c797432d29b57a5c0589
parentf6a776d91565a88bd430152cc38c0a2019aac33b
Merge remote-tracking branch 'origin/maint-0.2.5'
src/common/tortls.c