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

[nickm at torproject.org]

commit 2ecaa59bd794f1cba6a4ce3b82b73a8b4d27b2ab
Merge: 781b477 d229025
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 8 15:16:45 2014 -0400

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

 changes/bug13085 |    3 +++
 src/or/control.c |    8 ++++----
 src/or/control.h |    4 ++--
 src/or/or.h      |    5 +++--
 4 files changed, 12 insertions(+), 8 deletions(-)