commit 7ad0cd209cae8b4382d5e9c405e995252f714964 Merge: c472ac4 de9de9e Author: Nick Mathewson nickm@torproject.org Date: Thu May 1 12:39:39 2014 -0400

Merge remote-tracking branch 'public/bug9635'

changes/bug9635 | 3 +++ src/or/onion.c | 12 +++++++++--- src/or/onion_fast.c | 1 + src/or/onion_ntor.c | 12 ++++++++++-- src/or/onion_tap.c | 4 +++- 5 files changed, 26 insertions(+), 6 deletions(-)