commit 5c813f6ca1d6e385cfad5219108f8ac00677cf35 Merge: 9b11dc3 6c146f9 Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 12 15:32:15 2014 -0500

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

changes/bug13296 | 5 +++++ src/or/config.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-)