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

[nickm at torproject.org]

commit fc5cab44724e8328e2186f22114625388f1c8f0d
Merge: a5cc5ad ab4b296
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 16 13:29:14 2014 -0400

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

 changes/bug8093 |    3 +++
 src/or/relay.c  |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)