Merge branch 'hsdir_assignment' into maint-0.2.2
commitd34a5cdc597824e72453009ed209e5644f158e90
authorNick Mathewson <nickm@torproject.org>
Sat, 12 Mar 2011 04:30:25 +0000 (11 23:30 -0500)
committerNick Mathewson <nickm@torproject.org>
Sat, 12 Mar 2011 04:30:25 +0000 (11 23:30 -0500)
tree30a08d2b6afa8bf267cc8ae1668343959a41b777
parent600ad7bf8d499d04259586bcf91afed7dfb88f99
parent3a0c6021556abc96f4c610d5e097e3890216595f
Merge branch 'hsdir_assignment' into maint-0.2.2