[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/myfamily'

[nickm@xxxxxxxxxxxxxx]

commit c80b5336d93ddd66962ca792bd6b081148a7d971
Merge: a3d1c38ea 96a24568c
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Thu Jan 11 19:59:32 2018 -0500

    Merge remote-tracking branch 'sebastian/myfamily'

 doc/tor.1.txt | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)



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