[tor-commits] [tor/maint-0.2.2] Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2

[nickm at torproject.org]

commit 491dc3a601d7c2610503f73192bd1a40bcb37ab2
Merge: 6d85a79 af54a01
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 4 11:40:52 2012 -0400

    Merge remote-tracking branch 'public/bug6007_strict_squashed' into maint-0.2.2

 changes/bug6007        |    5 +++++
 src/or/connection_or.c |   22 ++++++++++++++++++++--
 2 files changed, 25 insertions(+), 2 deletions(-)