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

[nickm@xxxxxxxxxxxxxx]

commit ff46d08fd4f1fd6a93fd878e1b4b18f610b53132
Merge: 582f78454 abde29824
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed May 9 11:53:18 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/bug25761     | 3 +++
 src/or/hs_service.c  | 5 -----
 src/or/rendservice.c | 5 +++--
 3 files changed, 6 insertions(+), 7 deletions(-)

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