[tor-commits] [tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4

[nickm at torproject.org]

commit 82fea1b0dffe2cb808e997b891106651d6a7bb97
Merge: 72f775e d780cd5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jun 14 01:45:35 2013 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
    
    Using "ours" strategy to avoid taking changes.