commit 3cf23be712cad5537a77029e63895154c1c900ea Merge: 1587e0d ad1ae44 Author: Nick Mathewson nickm@torproject.org Date: Mon Apr 4 15:35:23 2011 -0400

Merge branch 'static-work'

INSTALL | 27 +++++++++++++++++++++++++++ changes/bug2702 | 5 +++++ changes/static-flag | 4 ++++ configure.in | 9 +++++++++ 4 files changed, 45 insertions(+), 0 deletions(-)