[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

[arma at torproject.org]

commit 6cf02b9ad6c937c84c9a43ef6181863275b90df4
Merge: 20d4356 c6f1668
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Sep 4 23:46:46 2013 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/bug9400     |    7 ++
 changes/bug9671_023 |    5 ++
 changes/feature9574 |    7 ++
 src/common/compat.c |   14 ++--
 src/or/circuituse.c |    4 +-
 src/or/onion.c      |  231 +++++++++++++++++++++++++++++++++++++++++----------
 src/or/onion.h      |    4 +
 src/test/test.c     |   46 ++++++++++
 8 files changed, 264 insertions(+), 54 deletions(-)