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

[nickm@xxxxxxxxxxxxxx]

commit fe12c9756aa6c3ba6f943ea2549dc8a8888b3332
Merge: e0d1ab417 b86c9acac
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Dec 1 12:13:40 2017 -0500

    Merge branch 'maint-0.3.2' into release-0.3.2

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

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