]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'origin/maint-0.2.2'
authorNick Mathewson <nickm@torproject.org>
Fri, 16 Dec 2011 22:50:54 +0000 (17:50 -0500)
committerNick Mathewson <nickm@torproject.org>
Fri, 16 Dec 2011 22:50:54 +0000 (17:50 -0500)
commitd37cb8f74aa741cebe0001a4b56bd2bae539e225
tree63e2ced7d4efe0de8e633b7f6746fccdcccd6408
parent9df0bf7a40eab077a5959eb9df6b1db79c729dde
parentcefff11950d0b80de02bc956d5eb21ceeb81260c
Merge remote-tracking branch 'origin/maint-0.2.2'