Merge branch 'bug2279' into maint-0.2.2
commitf10949e1bc9737c79665207696774b7abed77f00
authorNick Mathewson <nickm@torproject.org>
Mon, 7 Feb 2011 17:43:54 +0000 (7 12:43 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 7 Feb 2011 17:43:54 +0000 (7 12:43 -0500)
tree5b398de8da430752343bd4df71bb729367f0a318
parentbe021edb22d212765f62a2f79f33addc58bd4b39
parent7ceb099c79bccf36d53090a6e49b1d2e08a61e76
Merge branch 'bug2279' into maint-0.2.2