Merge remote-tracking branch 'andrea/bug11476'
commit1a73e178011d24ad2ef252dab7256d7c4fa94a64
authorNick Mathewson <nickm@torproject.org>
Thu, 22 May 2014 20:27:29 +0000 (22 16:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 22 May 2014 20:27:29 +0000 (22 16:27 -0400)
tree35990ad7f447fcebe8422aed4b66047f9fec2d29
parentfef65fa64341fb70df0e7b34d91d3b08a74e7aad
parent170e0df7417e78f7b689f3189e7a0b5b8dfd2722
Merge remote-tracking branch 'andrea/bug11476'
configure.ac
src/or/circuitlist.c
src/or/main.c
src/test/test.c
src/test/test_oom.c
src/test/test_util.c