commit 9df0bf7a40eab077a5959eb9df6b1db79c729dde Merge: 3ee5924 bcca541 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 16 17:48:25 2011 -0500

Merge remote-tracking branch 'sebastian/clang-3.0-fixes_master'

changes/clang_30_options | 5 +++++ configure.in | 10 ++++------ 2 files changed, 9 insertions(+), 6 deletions(-)