[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/561'

[nickm@xxxxxxxxxxxxxx]

commit 4002a84ffe97480b6bd67cbfb9c65d19457f41fe
Merge: 00509aaaf 894d207f8
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Wed Dec 5 08:29:41 2018 -0500

    Merge remote-tracking branch 'tor-github/pr/561'

 changes/doc28560 | 3 +++
 doc/tor.1.txt    | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

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