commit 16b1b2199d1e23968ab74a8ab08d59e8aae90423 Merge: 0f628d6 b3281fc Author: Nick Mathewson nickm@torproject.org Date: Thu Mar 12 13:13:06 2015 -0400

Merge remote-tracking branch 'origin/maint-0.2.6'

changes/bug15240 | 6 ++++++ src/or/config.c | 13 +++++++------ 2 files changed, 13 insertions(+), 6 deletions(-)