[tor-commits] [tor/release-0.2.5] Merge remote-tracking branch 'arma/bug12996b' into maint-0.2.5

[nickm at torproject.org]

commit 41058dce95b4e94c10b156728524d24d69620ed0
Merge: 4a6f5bb 7a878c1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 29 16:44:50 2014 -0400

    Merge remote-tracking branch 'arma/bug12996b' into maint-0.2.5

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