Merge remote-tracking branch 'public/bug8012'
commitb415aba5fa3b52aabd250007a6f6304ee7825cbb
authorNick Mathewson <nickm@torproject.org>
Tue, 22 Jan 2013 14:54:30 +0000 (22 14:54 +0000)
committerNick Mathewson <nickm@torproject.org>
Tue, 22 Jan 2013 14:54:30 +0000 (22 14:54 +0000)
tree0169a7b501d41f8311568687e92cce3b9095b246
parentc71b7db8f354bd5469856eea60107ce25b9aac13
parentdd77b652f236cf41cb585533b6a07a3557062039
Merge remote-tracking branch 'public/bug8012'