Merge remote-tracking branch 'origin/maint-0.2.4'

This commit is contained in:
Nick Mathewson
2013-03-19 15:13:07 -04:00
3 changed files with 11 additions and 8 deletions
+3
View File
@@ -0,0 +1,3 @@
o Documentation fixes:
- Update tor-fw-helper.1.txt and tor-fw-helper.c to make option
names match. Fixes bug 7768.