]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Oct 2013 02:40:01 +0000 (22:40 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Oct 2013 02:40:01 +0000 (22:40 -0400)
1  2 
src/or/channel.c
src/or/channel.h

Simple merge
Simple merge