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

[nickm at torproject.org]

commit 4824f3ad9383f111901ab7e37fc70ec60b9d7a4c
Merge: 74356aa 4ccd4b5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 16 09:55:51 2013 -0400

    Merge remote-tracking branch 'asn/bug9265'

 src/test/test_pt.c |   25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)