commit 53ecfba2842831d9e500fd383f2ac4e00c258d95 Merge: 33df3e3 5ac26cb Author: Nick Mathewson <nickm@torproject.org> Date: Sat Jan 10 16:00:12 2015 -0500 Merge remote-tracking branch 'teor/fix-typos' src/common/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)