[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.5'

[nickm at torproject.org]

commit 126f220071b2313147240b585df6893d21943021
Merge: fb3000e 0872d8e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Nov 19 17:27:37 2014 -0500

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

 src/or/config.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)