Merge branch 'maint-0.3.2'
commit6b3c07648ce5860f5ef0f4193eb812e971c02407
authorNick Mathewson <nickm@torproject.org>
Wed, 3 Jan 2018 15:09:20 +0000 (3 10:09 -0500)
committerNick Mathewson <nickm@torproject.org>
Wed, 3 Jan 2018 15:09:20 +0000 (3 10:09 -0500)
tree474aee860331c0c7515ac42188b0d4117c370265
parentb62b40a572d8693daa5851eee5f423007535b3b6
parent9ef97a268b06fed7b07908823600911a2a6eadc1
Merge branch 'maint-0.3.2'
src/or/hs_common.c
src/or/hs_service.c