[tor/maint-0.2.2] Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2

22 Feb 2011


      commit 06deec15c9ecb7c40e3f7f8e05be887ab0705877
Merge: e606f19 491abbc
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue Feb 22 17:20:55 2011 -0500

    Merge remote branch 'origin/maint-0.2.1' into maint-0.2.2
    
    (This is an "ours" merge of the code for bug1859 backported to 0.2.1.)

nickm＠torproject.org

tags

participants (1)