[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug13399'

[nickm at torproject.org]

commit f179ff18f3d05cff2a28add5b0ae9df929d94536
Merge: bac6d54 efd5001
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Nov 1 17:04:04 2014 -0400

    Merge remote-tracking branch 'public/bug13399'

 changes/bug13399       |   12 ++++++++++++
 src/or/microdesc.c     |   36 ++++++++++++++++++------------------
 src/or/microdesc.h     |    2 +-
 src/or/networkstatus.c |    2 +-
 src/or/routerlist.c    |   30 ++++++++++++++++++------------
 src/or/routerlist.h    |    2 +-
 6 files changed, 51 insertions(+), 33 deletions(-)