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

[arma at torproject.org]

commit 2349833f71941e96a1bbdcf22c4645cef4ac3ced
Merge: e719d05 2c956f0
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun Dec 22 02:25:53 2013 -0500

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/bug10402          |   11 +++++++++++
 changes/bug10409          |    3 +++
 changes/bug10423          |    4 ++++
 changes/bug10456          |    6 ++++++
 src/common/crypto.c       |   13 ++++++++++---
 src/or/circuituse.c       |    2 +-
 src/or/dirvote.c          |    3 ++-
 src/or/microdesc.c        |   36 +++++++++++++++++++++++-------------
 src/or/routerparse.c      |   13 ++++++++++---
 src/or/routerparse.h      |    2 +-
 src/test/test_microdesc.c |   45 +++++++++++++++++++++++++++++++++++++++++++++
 11 files changed, 116 insertions(+), 22 deletions(-)