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

[nickm at torproject.org]

commit 4361795145ce7d44a092fd56268e71e6b4f8d031
Merge: c7d3eca 0c4baa0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 12 09:46:54 2013 -0400

    Merge remote-tracking branch 'asn/bug9363_take2'

 src/or/statefile.c |    3 ++-
 src/or/statefile.h |    4 ++++
 src/test/test_pt.c |   45 ++++++++++++++++++++++++++++++++++++++++-----
 3 files changed, 46 insertions(+), 6 deletions(-)