commit 9bf6da1861f8cd67a40ea4f24a12d09413a8926f
Merge: 1447324 8b82f62
Author: Nick Mathewson <[email protected]>
Date: Tue Feb 17 12:34:13 2015 -0500
Merge remote-tracking branch 'public/feature_13822'
changes/feature13822 | 5 +++++
src/or/config.c | 29 +++++++++++++++++------------
src/or/dirserv.c | 2 +-
src/or/or.h | 3 ++-
4 files changed, 25 insertions(+), 14 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
