]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.8'
authorNick Mathewson <nickm@torproject.org>
Thu, 5 May 2016 12:25:27 +0000 (08:25 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 5 May 2016 12:25:27 +0000 (08:25 -0400)
1  2 
src/or/directory.c
src/or/or.h
src/or/routerlist.c

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