[tor-commits] [tor/master] Merge remote-tracking branch 'public/not_bug8093'

[nickm at torproject.org]

commit e8dd34f1655e376942af2792f7d605898166b631
Merge: a5036d2 7581014
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 11 09:24:16 2014 -0400

    Merge remote-tracking branch 'public/not_bug8093'

 changes/not_bug_8093 |    4 ++++
 src/or/relay.c       |   10 ++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)