[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm@xxxxxxxxxxxxxx]

commit f9aed40156f5a85b35877a086a0a420cbd2fafcb
Merge: 2b6f24665 c3ea1ccf0
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue Oct 31 14:18:52 2017 -0400

    Merge branch 'maint-0.3.2'

 src/or/hs_descriptor.h | 1 -
 1 file changed, 1 deletion(-)

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