commit d96f7f38e855dd8912389058a0a5759b9e5c0d02 Merge: 5355b99dc 7df28ce29 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 13 12:26:46 2017 -0500

Merge branch 'maint-0.3.1' into release-0.3.1

changes/bug24262 | 3 +++ src/or/hs_common.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)