]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'origin/maint-0.2.4'
authorNick Mathewson <nickm@torproject.org>
Tue, 24 Sep 2013 14:47:26 +0000 (10:47 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 24 Sep 2013 14:47:26 +0000 (10:47 -0400)
1  2 
src/or/channel.c
src/or/connection_or.c

Simple merge
Simple merge