[tor-commits] [tor/master] Merge branch 'bug3465-022' into bug3465-023

[nickm at torproject.org]

commit c780bc4d0b30e05ce2212756d93315f5680035a7
Merge: 0b53646 93d52f6
Author: Robert Ransom <rransom.8774 at gmail.com>
Date:   Sat Jun 25 15:04:07 2011 -0700

    Merge branch 'bug3465-022' into bug3465-023
    
    * bug3465-022:
      Add BUILDTIMEOUT_SET to the result of GETINFO events/names
      Correct a comment
      Fix minor comment issues

 changes/bug3465-022   |    6 ++++++
 src/or/circuitbuild.c |   10 +++++-----
 src/or/circuitlist.c  |    2 +-
 src/or/control.c      |    3 ++-
 4 files changed, 14 insertions(+), 7 deletions(-)