commit cc3b04a8c1edbeb1a488e319e3c0d28acd227417 Merge: 9f9b19e 37a76d7 Author: Nick Mathewson nickm@torproject.org Date: Thu Aug 28 08:36:00 2014 -0400

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

changes/bug12948 | 8 ++++++++ src/or/config.c | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-)