]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6
authorNick Mathewson <nickm@torproject.org>
Thu, 12 Mar 2015 16:27:42 +0000 (12:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 12 Mar 2015 16:27:42 +0000 (12:27 -0400)
commit8a060d8643ff5a84cd8593f49af8221ef0855d36
treeed3534b3b6b8dd33595ec022df7c4b87d7d35f93
parent1a1d431cff40dd92e43df892b0369cd12c3596fb
parenteecd410984e3f1741dda877fe482e082a41db700
Merge remote-tracking branch 'origin/maint-0.2.5' into maint-0.2.6