[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug4725_take2'

[nickm at torproject.org]

commit 3cdc46457f487fb45d304b009ae710a79d696c13
Merge: 936b7b7 c79aa8f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Feb 16 15:22:15 2012 -0500

    Merge remote-tracking branch 'asn/bug4725_take2'

 changes/bug4725 |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)