Merge branch 'maint-0.2.8' into maint-0.2.9
commit7e2b012b46a4ade2818e47be15d76255cf6f121e
authorNick Mathewson <nickm@torproject.org>
Thu, 30 Nov 2017 17:07:59 +0000 (30 12:07 -0500)
committerNick Mathewson <nickm@torproject.org>
Thu, 30 Nov 2017 17:07:59 +0000 (30 12:07 -0500)
tree2bd0080fa3ff1e58db831caa2c84dfb18ff651dc
parent52d7af631cb1075289ba519d0c3b89e0b5816f5e
parentba4a9cf0c094b7a19e1bf44264b1244a23a4b38e
Merge branch 'maint-0.2.8' into maint-0.2.9
src/common/crypto.c
src/or/rendservice.c
src/or/routerlist.c