commit cefff11950d0b80de02bc956d5eb21ceeb81260c Merge: 562c974 bcca541 Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 16 17:49:41 2011 -0500

Merge remote-tracking branch 'sebastian/clang-3.0-fixes_022' into maint-0.2.2

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