commit 6178aaea0698d7f62754c2aa1574ad7fd4fa781d
Merge: ee01e41 07bb171
Author: Nick Mathewson <[email protected]>
Date: Fri Sep 20 11:01:10 2013 -0400
Merge remote-tracking branch 'origin/maint-0.2.4'
changes/no_client_timestamps_024 | 14 ++++++++++++++
doc/tor.1.txt | 12 +++++++++++-
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, 57 insertions(+), 17 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
