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

[nickm at torproject.org]

commit f113a263deda8e1619f46cd913fc24ac28da832d
Merge: d6fa823 41058dc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 29 16:45:56 2014 -0400

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

 changes/bug12996   |    5 +++++
 src/or/onion_tap.c |    5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)