[tor-commits] [gettor/develop] Merge branch 'develop' of ssh://git-rw.torproject.org/gettor into develop

commit b0261b785ec3bab2cc0324900036c5114590fab9 Merge: 3cc92b1 b2b07f3 Author: ilv <ilv@users.noreply.github.com> Date: Thu Dec 31 17:18:57 2015 -0300 Merge branch 'develop' of ssh://git-rw.torproject.org/gettor into develop lang/smtp/i18n/en/LC_MESSAGES/en.po | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)