Merge remote-tracking branch 'rransom-tor/bug4251-022' into maint-0.2.2
commit3cb79a0286e3e4f87d590511f3cedb02e28de972
authorNick Mathewson <nickm@torproject.org>
Thu, 20 Oct 2011 04:01:58 +0000 (20 00:01 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 20 Oct 2011 04:01:58 +0000 (20 00:01 -0400)
tree7baf3352fc302441c01cb38852c2aa6ae195e9da
parent5aa45ed6af87efaec5d6d4a32e8acbc733be8c3d
parent739c21e97b5c78ee76c7283993e7ca01f6d3beec
Merge remote-tracking branch 'rransom-tor/bug4251-022' into maint-0.2.2