commit 70762a0e9c396bdba01b8cc1cdc6d1c275f9aa1d Merge: 22a8216 87576e8 Author: Roger Dingledine <arma@torproject.org> Date: Sat Sep 20 16:51:41 2014 -0400 Merge branch 'maint-0.2.5' into release-0.2.5 changes/bug13100 | 3 +++ src/or/config.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)