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

[nickm at torproject.org]

commit 7795f42e4be2d04d3f40e227a094dbdce533b173
Merge: b3b4f31 09d90b1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 27 10:33:24 2012 -0400

    Merge branch 'bug6524_nm'

 .gitignore                          |    3 +-
 Makefile.am                         |   21 ++++-
 changes/nonrecursive_make           |   16 ++++
 configure.in                        |   19 +---
 contrib/Makefile.am                 |   23 -----
 contrib/include.am                  |   20 +++++
 contrib/suse/Makefile.am            |    3 -
 contrib/suse/include.am             |    1 +
 contrib/updateVersions.pl           |    2 +-
 doc/Makefile.am                     |   89 -------------------
 doc/include.am                      |   69 +++++++++++++++
 doc/tor-fw-helper.1.txt             |    2 +
 doc/tor-gencert.1.txt               |    2 +
 doc/tor-resolve.1.txt               |    2 +
 doc/tor.1.txt                       |    2 +
 doc/torify.1.txt                    |    8 ++-
 src/Makefile.am                     |    5 -
 src/common/Makefile.am              |   67 ---------------
 src/common/include.am               |   73 ++++++++++++++++
 src/config/Makefile.am              |   16 ----
 src/config/include.am               |   16 ++++
 src/include.am                      |    6 ++
 src/or/Makefile.am                  |  160 -----------------------------------
 src/or/include.am                   |  160 +++++++++++++++++++++++++++++++++++
 src/test/Makefile.am                |   51 -----------
 src/test/include.am                 |   55 ++++++++++++
 src/tools/Makefile.am               |   22 -----
 src/tools/include.am                |   22 +++++
 src/tools/tor-fw-helper/Makefile.am |   38 --------
 src/tools/tor-fw-helper/include.am  |   36 ++++++++
 src/win32/Makefile.am               |    3 -
 src/win32/include.am                |    3 +
 32 files changed, 514 insertions(+), 501 deletions(-)