commit 83dfcfbc4a295ca52325f47291d109cd0a16ac8f
Merge: b34c5c6 6094a88
Author: Nick Mathewson <ni...@torproject.org>
Date: Mon Jan 18 19:51:57 2016 -0500
Merge remote-tracking branch 'teor/bug18050' into maint-0.2.7
changes/bug18050 | 7 +++++++
src/or/main.c | 10 ++++++----
src/or/router.c | 13 +++++++++----
3 files changed, 22 insertions(+), 8 deletions(-)
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
