[tor-commits] [tor/master] Merge remote-tracking branch 'public/gcc-295-fix' into maint-0.2.2

nickm at torproject.org nickm at torproject.org
Fri Sep 9 16:56:11 UTC 2011


commit b0695c11ebfff4ca4dc6570e49e27c03ca65e8ab
Merge: 4467799 45ca0d2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 9 12:54:27 2011 -0400

    Merge remote-tracking branch 'public/gcc-295-fix' into maint-0.2.2

 changes/bug3894       |    4 ++
 configure.in          |    2 +-
 src/common/torgzip.c  |    3 +-
 src/common/util.c     |    8 +++--
 src/or/circuitbuild.c |   17 +++++-----
 src/or/control.c      |    4 +-
 src/or/relay.c        |    2 +-
 src/or/rephist.c      |    4 +-
 src/or/routerlist.c   |   10 +++---
 src/or/routerparse.c  |   82 ++++++++++++++++++++++++------------------------
 src/test/test.c       |    4 +-
 11 files changed, 74 insertions(+), 66 deletions(-)






More information about the tor-commits mailing list