sengler/tor-parallel-relay-conn @ 2cb82c33bcb59ce65c9738ff8ff4977f39fa3d9f

Andrea Shepard 2cb82c33bc Merge branch 'bug7267' of ssh://git-rw.torproject.org/user/andrea/tor		%!s(int64=13) %!d(string=hai) anos
..
bug7059a	0e8be13b9f Allow an optional $ in GETINFO ns/id/<identity>	%!s(int64=13) %!d(string=hai) anos
bug7267	3b517ea5f4 Add changes file for bug 7267	%!s(int64=13) %!d(string=hai) anos
dist-geoip6	b17aa28e46 Actually distribute the geoip6 file.	%!s(int64=13) %!d(string=hai) anos