Merge branch 'maint-0.2.9' into maint-0.3.0
commit83439e78cc08f5a05d314de4409e69aa6d1601d7
authorRoger Dingledine <arma@torproject.org>
Thu, 25 May 2017 04:27:27 +0000 (25 00:27 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 25 May 2017 04:27:27 +0000 (25 00:27 -0400)
tree26f9ba9d65c82f70bb775c0ffecea4d3b354449c
parent5c52d3c2c05a42c9535789d335a51f09a7855d68
parentec61ae59a5d009a9e80f3bfa9a2aa5f5dfa05551
Merge branch 'maint-0.2.9' into maint-0.3.0
src/or/dirserv.c