]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'rename_queue_macros_squashed'
authorNick Mathewson <nickm@torproject.org>
Wed, 30 Jan 2013 17:58:59 +0000 (12:58 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 30 Jan 2013 17:58:59 +0000 (12:58 -0500)

Trivial merge