commit b1a11bd9699e64af680e4e7abcbaea0f8752e2e2 Merge: 16036be 3a19630 Author: ilv <ilv@users.noreply.github.com> Date: Tue Nov 3 16:34:30 2015 -0300 Merge branch 'master' of ssh://git-rw.torproject.org/gettor AUTHORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)