[tor-commits] [tor/master] Merge branch 'bug18902_squashed'

[nickm at torproject.org]

commit a8676b1edecee2d1d472b7f67dd026ef7b084a2f
Merge: f048855 4757303
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jul 28 06:59:03 2016 -0400

    Merge branch 'bug18902_squashed'

 changes/bug19578             |  3 +++
 configure.ac                 |  1 +
 src/common/util.c            | 13 +++++++------
 src/or/channeltls.c          |  4 ++--
 src/or/circuitbuild.c        | 14 +++++++-------
 src/or/config.c              | 30 ++++++++++++++----------------
 src/or/connection.h          | 14 +++++++-------
 src/or/connection_edge.c     |  8 ++++----
 src/or/connection_or.c       |  7 +++----
 src/or/control.c             | 30 ++++++++++++++++--------------
 src/or/dirvote.c             | 12 ++++++------
 src/or/entrynodes.c          |  1 -
 src/or/geoip.c               | 17 ++++++++---------
 src/or/nodelist.c            |  6 ++++--
 src/or/rendservice.c         |  3 +--
 src/or/rephist.c             | 14 +++++++-------
 src/or/router.c              | 12 ++++++------
 src/or/routerkeys.c          | 10 +++++-----
 src/or/routerlist.c          |  6 +++---
 src/or/routerparse.c         | 40 ++++++++++++++++++++++------------------
 src/or/scheduler.c           |  8 ++++----
 src/or/transports.c          | 12 ++++++------
 src/test/bench.c             |  9 ++++-----
 src/test/test_addr.c         |  6 +++---
 src/test/test_buffers.c      |  6 +++---
 src/test/test_cell_formats.c |  4 ++--
 src/test/test_containers.c   | 24 ++++++++++++------------
 src/test/test_dir.c          | 10 +++++-----
 src/test/test_dns.c          |  8 ++++----
 src/test/test_microdesc.c    |  2 +-
 src/test/test_policy.c       |  9 ++++-----
 src/test/test_pt.c           | 12 ++++++------
 src/test/test_scheduler.c    |  6 ++++--
 src/test/test_util.c         |  6 +++---
 34 files changed, 187 insertions(+), 180 deletions(-)