]> git.ipfire.org Git - thirdparty/tor.git/commit
Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5
authorNick Mathewson <nickm@torproject.org>
Tue, 9 Sep 2014 15:04:54 +0000 (11:04 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 9 Sep 2014 15:04:54 +0000 (11:04 -0400)
commit8eed82b3d4bc8d15bd4ec7f229717f903dd6d6c7
tree0587bfcb5b0a84db5060b5b95f452963b774968e
parentdd22ab519ab9ac7affa3bd775b6021049ebe7dd9
parent39a017809b6e7f8f779cfa0b4ebea3c0209bef0c
Merge remote-tracking branch 'andrea/bug12160_025' into maint-0.2.5