]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'bug12899_squashed'
authorNick Mathewson <nickm@torproject.org>
Tue, 9 Sep 2014 15:51:18 +0000 (11:51 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 9 Sep 2014 15:51:18 +0000 (11:51 -0400)
1  2 
src/or/connection_or.c
src/or/or.h

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