[tor-commits] [tor/master] Merge branch 'no_client_timestamps_024_v2' into maint-0.2.4

[nickm at torproject.org]

commit 07bb17185681f875be461c4fea6c661fae2dfde9
Merge: 0c807cf 39bb59d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 20 11:00:43 2013 -0400

    Merge branch 'no_client_timestamps_024_v2' into maint-0.2.4

 changes/no_client_timestamps_024 |   14 ++++++++++++++
 doc/tor.1.txt                    |    9 +++++++++
 src/or/config.c                  |    1 +
 src/or/connection_or.c           |   23 ++++++++---------------
 src/or/or.h                      |    3 +++
 src/or/rendclient.c              |   20 +++++++++++++++++++-
 src/or/rendservice.c             |    1 +
 7 files changed, 55 insertions(+), 16 deletions(-)