[tor-commits] [tor/master] Merge remote-tracking branch 'atagar/trac14806'

commit 1b913777c78e61897e530a91f5c60c8a94a2c1c7 Merge: cf55070 44abbf5 Author: Nick Mathewson nickm@torproject.org Date: Wed Feb 25 09:30:29 2015 -0500

Merge remote-tracking branch 'atagar/trac14806'

changes/bug14806 | 3 + src/test/include.am | 2 - src/test/test_cmdline_args.py | 311 ----------------------------------------- 3 files changed, 3 insertions(+), 313 deletions(-)