]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge branch 'maint-0.2.8' into maint-0.2.9
authorNick Mathewson <nickm@torproject.org>
Mon, 19 Dec 2016 12:58:43 +0000 (07:58 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Dec 2016 12:58:43 +0000 (07:58 -0500)
1  2 
src/or/rendcache.c
src/or/routerparse.c

Simple merge
Simple merge