[tor-commits] [tor/master] Merge branch 'rename_queue_macros_squashed'

[nickm at torproject.org]

commit 73f85905aa9cfe6ee4f014f54d5713ab662c207a
Merge: 29136bd 35daf6f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 30 12:58:59 2013 -0500

    Merge branch 'rename_queue_macros_squashed'

 changes/rename_queue_macros |    6 +
 src/ext/README              |    4 +-
 src/ext/tor_queue.h         |  341 +++++++++++++++++++++----------------------
 src/or/channel.c            |   70 +++++-----
 src/or/channel.h            |    4 +-
 src/or/onion.c              |   16 +-
 6 files changed, 222 insertions(+), 219 deletions(-)