[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug11296'

[nickm at torproject.org]

commit 0b43c499b20da76aca2d43f149b8291a8dfd90d5
Merge: 6da2544 e83eddd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 26 11:46:51 2014 -0400

    Merge remote-tracking branch 'public/bug11296'

 changes/bug11296                   |    3 +++
 src/tools/tor-fw-helper/include.am |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)