Merge commit 'nickm/1776_redux_v1' into maint-0.2.2
commita641646a980dcf861f3b438821dfc74e1b98fe40
authorRoger Dingledine <arma@torproject.org>
Tue, 16 Nov 2010 04:29:09 +0000 (15 23:29 -0500)
committerRoger Dingledine <arma@torproject.org>
Tue, 16 Nov 2010 04:29:09 +0000 (15 23:29 -0500)
tree0bb4cab13438522da98def5a5c00dc6d5d3f7be9
parentcbad9f45206343908040a8fafe05aa5c7c1208d7
parent45b500d5a60ca6c43e5a545b9e15e203be1feeac
Merge commit 'nickm/1776_redux_v1' into maint-0.2.2