]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.6'
authorNick Mathewson <nickm@torproject.org>
Tue, 19 May 2015 18:59:39 +0000 (14:59 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 19 May 2015 18:59:39 +0000 (14:59 -0400)
commit32bd533ddac5bd7d594a81119449b3d30206eedd
tree7c574d67801a8b18290d1c2e251c16adcc365937
parentd5e4a6343694574cebc9f9bd7ea83a168bdad3aa
parentb3a225fb13d57125888bc6e2c84bdca9abce00f6
Merge remote-tracking branch 'origin/maint-0.2.6'