commit 60bdd2a8c3f5415dacf02b725f92bb240d85eb76
Merge: 0f9e6c7 e4ef9f7
Author: Nick Mathewson <[email protected]>
Date: Tue Nov 8 19:25:39 2016 -0500
Merge branch 'maint-0.2.9' into release-0.2.9
changes/bug20085 | 4 ++++
src/config/torrc.minimal.in-staging | 2 +-
src/config/torrc.sample.in | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
