commit 344bb1d64c539ca66cd377350065e9486397d1eb Merge: e1e34ee 20e0e7d Author: Nick Mathewson <[email protected]> Date: Mon Sep 10 10:09:29 2012 -0400
Merge branch 'bug3155'
changes/bug3155 | 6 ++++++
src/or/config.c | 10 +++++++---
src/or/connection_or.c | 2 +-
src/or/or.h | 4 ++--
4 files changed, 16 insertions(+), 6 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
