Merge branch 'maint-0.2.8' into maint-0.2.9
commitde656474611c43f24dd5fff430de945b34b738bf
authorNick Mathewson <nickm@torproject.org>
Mon, 19 Dec 2016 12:58:43 +0000 (19 07:58 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Dec 2016 12:58:43 +0000 (19 07:58 -0500)
treee0d5e0e39839d1892afdeb55b8d7cb6f1d9b4bc7
parent169a93fff2510cf0eae76cdd198c19687bb1e875
parentc11de4c45f5611a12fba005032941a40f5ce5f66
Merge branch 'maint-0.2.8' into maint-0.2.9
src/or/rendcache.c
src/or/routerparse.c