commit edde1a7844f6c0e3aafd8463edc3c10f486eb51c
Merge: 1457364 6b0c443
Author: Nick Mathewson <[email protected]>
Date: Tue Apr 7 14:09:55 2015 -0400
Merge branch 'bug15541_squashed'
changes/bug15541 | 5 +++++
src/or/config.c | 53 ++++++++++++++++++++++++++++++++---------------------
src/or/main.c | 6 ++++--
3 files changed, 41 insertions(+), 23 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
