commit 2937de21803174e14873f68b34ba8a6c62285c45 Merge: 3d6652f b159ffb Author: Nick Mathewson <nickm@torproject.org> Date: Mon Aug 18 10:20:37 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.5' src/or/config.c | 2 ++ 1 file changed, 2 insertions(+)