commit 45ac7bbca1181e1a623b48adb82898b0173f4b32 Merge: 403a4f3 b045e32 Author: Sebastian Hahn <sebastian@torproject.org> Date: Wed Nov 23 01:30:51 2016 +0100 Merge branch 'master' into staging .htaccess | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)