]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.9'
authorNick Mathewson <nickm@torproject.org>
Thu, 3 Nov 2016 19:45:16 +0000 (15:45 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 3 Nov 2016 19:45:16 +0000 (15:45 -0400)
1  2 
src/or/connection_edge.c
src/or/main.c

Simple merge
diff --cc src/or/main.c
Simple merge