Merge remote branch 'sebastian/bug2660' into maint-0.2.2
commit3bd83b8fb64c070210c589f65ed8cc023dd47077
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Mar 2011 22:09:23 +0000 (7 17:09 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Mar 2011 22:09:23 +0000 (7 17:09 -0500)
tree21d47d146606c7996b4059aea4accbd27697baee
parent35fcec38809f9805326d8e2c81bad33d0ef000ae
parentf83debb51d7fa4a1827967d8bea145636c855f89
Merge remote branch 'sebastian/bug2660' into maint-0.2.2