Merge branch 'maint-0.3.0'
commit657297a9f8bedfab2dadfaee53768a1f9b8a558e
authorRoger Dingledine <arma@torproject.org>
Thu, 25 May 2017 04:28:11 +0000 (25 00:28 -0400)
committerRoger Dingledine <arma@torproject.org>
Thu, 25 May 2017 04:28:11 +0000 (25 00:28 -0400)
tree5c3db3cf7eac9c74bfa0df9d3d6ffe317fd581ce
parent511c9006867926cbfcc824567b37e78856fa46d9
parent83439e78cc08f5a05d314de4409e69aa6d1601d7
Merge branch 'maint-0.3.0'
src/or/dirserv.c