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

[nickm@xxxxxxxxxxxxxx]

commit 84ff776893d248d2fdf5e1f21f765ff58a93403f
Merge: d8a9c9f2c cb813a352
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Fri Apr 20 14:39:48 2018 -0400

    Merge branch 'maint-0.3.3' into release-0.3.3

 changes/25857 | 3 +++
 doc/tor.1.txt | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

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