[tor-commits] [torspec/master] Merge remote-tracking branch 'atagar/ticket_6445'

[nickm at torproject.org]

commit 4bd7a767a89dab244d0731e906e5d2a3137737e7
Merge: ec9ca81 8b4a12a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 23 12:41:42 2012 -0400

    Merge remote-tracking branch 'atagar/ticket_6445'

 version-spec.txt |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)