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

[nickm at torproject.org]

commit 9064238495151915699fa50c437722f236b877fc
Merge: 4c06a80 b99457d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 23 21:50:43 2012 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3'
    
    This is an "ours" merge; we want a separate fix for this bug (bug7191)
    in master. Rather than catching the two failing cases, we need to make
    them not fail.