[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit b163e801bcc96f4720a0ac2bf1ade5eb2701a9c1
Merge: ed60083 0cf327d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 15 12:20:17 2013 -0400

    Merge remote-tracking branch 'origin/maint-0.2.4'
    
    Conflicts:
    	src/or/routerlist.c

 changes/bug7280                                |    4 +
 doc/contrib/incentives.txt                     |  479 ------------------------
 src/common/container.h                         |    5 -
 src/common/crypto.c                            |    4 +-
 src/common/util.c                              |  109 ------
 src/common/util.h                              |    6 -
 src/or/dirserv.h                               |    1 -
 src/or/hibernate.c                             |    4 -
 src/or/main.c                                  |    4 -
 src/or/networkstatus.c                         |   12 -
 src/or/networkstatus.h                         |    1 -
 src/or/or.h                                    |    9 -
 src/or/rendcommon.c                            |    7 -
 src/or/rendcommon.h                            |    1 -
 src/or/routerlist.c                            |    1 -
 src/or/transports.c                            |    4 -
 src/test/test.c                                |    5 -
 src/test/test_dir.c                            |    2 -
 src/test/test_util.c                           |   73 ----
 src/tools/tor-fw-helper/tor-fw-helper-natpmp.c |   14 +-
 src/tools/tor-fw-helper/tor-fw-helper.c        |    2 +-
 21 files changed, 16 insertions(+), 731 deletions(-)