Merge remote-tracking branch 'public/bug4367'
commit4af82fb3886e8be25ba83a1f93da54bf0d5d7974
authorNick Mathewson <nickm@torproject.org>
Tue, 15 Nov 2011 03:35:49 +0000 (14 22:35 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 15 Nov 2011 03:35:49 +0000 (14 22:35 -0500)
tree7c63e4492769d1e2f927553cd6727e0fc78e6021
parent8592126a184c5f80e3213085d666362f21320df0
parent325a659cb16350b1e28db803e2e673068ca2eb82
Merge remote-tracking branch 'public/bug4367'