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

[nickm at torproject.org]

commit 23a95986cee0479669ca49e3d2397238070d3fe9
Merge: d41ab97 1c1d71f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jun 25 11:20:11 2015 -0400

    Merge branch 'maint-0.2.6' into release-0.2.6

 changes/bug16013                          |    5 +++++
 changes/bug16360-failed-crypto-early-init |    7 ++++++
 changes/bug16363                          |    4 ++++
 changes/bug16381                          |   13 +++++++++++
 changes/bug16400                          |    5 +++++
 src/common/sandbox.c                      |    8 +++++++
 src/or/circuituse.c                       |   12 ++++++++++
 src/or/main.c                             |    2 +-
 src/or/rendcommon.c                       |   10 +++++++--
 src/or/routerparse.c                      |   14 +++++++++---
 src/test/test_microdesc.c                 |   34 +++++++++++++++++++++++++++++
 11 files changed, 108 insertions(+), 6 deletions(-)