commit ec18c8a06e4cb8b26c9af4f416135191e9c8cde9
Merge: 37504b5 9cabedd
Author: Nick Mathewson <[email protected]>
Date: Mon Dec 19 11:29:29 2011 -0500
Merge branch 'haiku_port_rebase'
changes/portability_01_haiku | 14 ++++++++++++++
configure.in | 16 +++++++++++++++-
src/or/Makefile.am | 2 +-
src/or/main.c | 7 +++----
src/test/Makefile.am | 8 ++++----
src/tools/Makefile.am | 8 +++++---
6 files changed, 42 insertions(+), 13 deletions(-)
_______________________________________________
tor-commits mailing list
[email protected]
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
