Merge branch 'maint-0.2.8' into maint-0.2.9
commiteaaa1108a3eb1271ad2c8f3fbb8a6845d24de874
authorNick Mathewson <nickm@torproject.org>
Mon, 11 Dec 2017 21:54:14 +0000 (11 16:54 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 11 Dec 2017 21:54:14 +0000 (11 16:54 -0500)
tree2082a197683d25a240200b976e4e725572e96798
parent7e486dd6f7f845c14471b406d6bc7dfa4f593b12
parentbc1ea4f470734f7fa22949318a98e286da5cba49
Merge branch 'maint-0.2.8' into maint-0.2.9
src/or/rephist.c
src/or/router.c