commit dbea64aab67d2471653a6f8ce2b974e68df2ed11
Merge: 01d6e23f7 db5aa54a4
Author: Nick Mathewson <ni...@torproject.org>
Date: Thu Jan 11 20:00:43 2018 -0500
Merge branch 'maint-0.3.2' into release-0.3.2
changes/bug24526 | 4 ++++
doc/tor.1.txt | 12 ++++++++++--
src/config/torrc.minimal.in-staging | 6 ++++++
src/config/torrc.sample.in | 6 ++++++
4 files changed, 26 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
