commit b1ca8168a6a3902a2a64b8e5571508f2836c4acc Merge: cff49b4 da83ef2 Author: Isis Lovecruft <isis@torproject.org> Date: Tue Nov 19 02:58:24 2013 +0000 Merge branch 'hotfix/9872-options-subcommands-relative-rundir' into develop lib/bridgedb/test/test_persistent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)