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

[nickm]

commit 630677f339dda6fbb720380d42cfe247b85eb1a8
Merge: da3edc4 9c5a118
Author: Nick Mathewson <ni...@torproject.org>
Date:   Fri Jun 29 00:38:30 2012 -0400

    Merge remote-tracking branch 'origin/maint-0.2.3'

_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits