Merge branch 'bug21018_024' into maint-0.2.8
commitc11de4c45f5611a12fba005032941a40f5ce5f66
authorNick Mathewson <nickm@torproject.org>
Mon, 19 Dec 2016 12:58:21 +0000 (19 07:58 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 19 Dec 2016 12:58:21 +0000 (19 07:58 -0500)
treecddd8d7242cdc4f48ea1f243f0a507249320fe9b
parente0306320b543049bc66adb19e359b369c66fb775
parent0fb3058eced5dce355d777288bd9ec255b875db4
Merge branch 'bug21018_024' into maint-0.2.8
src/or/rendcache.c
src/or/routerparse.c