commit c134bb5a8d10d0f422b790ce8b587cf7188aa57e Merge: 0301a1d 6e4a400 Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 15 16:01:38 2013 -0500

Merge branch 'small_typo_fixes'

src/common/compat.h | 3 +- src/common/crypto_curve25519.c | 1 + src/or/circuitbuild.c | 61 +++++++++++++++++++++------------------ src/or/circuituse.c | 6 ++-- src/or/onion.c | 4 +- src/or/or.h | 2 +- 6 files changed, 42 insertions(+), 35 deletions(-)