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

[nickm at torproject.org]

commit 3fe2161d28f27e2f036991eb4d4b035a064d36b5
Merge: 78a3de1 14f4a5d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 7 10:51:38 2012 -0400

    Merge remote-tracking branch 'asn/bug6788'

 src/or/circuitbuild.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)