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

[nickm at torproject.org]

commit 382c27d8a9b5738356a575fc19fd0db1056293bf
Merge: 2d3f88f 9d237bb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 22 12:24:21 2015 -0400

    Merge branch 'ticket2325_squashed'

 changes/ticket2325   |    7 ++
 doc/include.am       |    3 +-
 doc/torrc_format.txt |  205 ++++++++++++++++++++++++++++++++++++++++++++++++++
 src/common/util.c    |   33 +-------
 4 files changed, 216 insertions(+), 32 deletions(-)