[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

[arma at torproject.org]

commit 88516f65c9753d6ec60dd7cb0c28c3ff91fdb101
Merge: 5a8dcca 1c2e4d1
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Sep 24 22:47:53 2011 -0400

    Merge branch 'maint-0.2.2'

 changes/ticket-4063   |    6 ++++++
 src/or/circuitbuild.c |    6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)