]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'public/bug5650_squashed' into maint-0.2.4
authorNick Mathewson <nickm@torproject.org>
Fri, 12 Apr 2013 05:13:22 +0000 (01:13 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 12 Apr 2013 05:13:22 +0000 (01:13 -0400)
1  2 
src/or/connection.c
src/or/or.h

Simple merge
diff --cc src/or/or.h
Simple merge