[tor-commits] [tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2

[nickm@xxxxxxxxxxxxxx]

commit 04b5b87098f48c6016110b26a1cf62377437dfea
Merge: 2b0d37078 0971b3ce4
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Sep 14 12:56:30 2018 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug27335    | 4 ++++
 src/or/hs_service.c | 6 +++---
 2 files changed, 7 insertions(+), 3 deletions(-)

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits