[or-cvs] [tor/master] Merge branch 'bug2408-v2-021' into bug2408-v2-022 (keep-ours)

[nickm]

commit 043d8d34a67fbe057a31bbe9c21299b6119fac21
Merge: 449d895 5fc6967
Author: Robert Ransom <rransom.8...@gmail.com>
Date:   Wed Feb 9 03:10:16 2011 -0800

    Merge branch 'bug2408-v2-021' into bug2408-v2-022 (keep-ours)