Merge branch 'bug1511'
commit9b49a89430eac9a50fdb067aefec9d1561872796
authorNick Mathewson <nickm@torproject.org>
Fri, 24 Sep 2010 03:16:25 +0000 (23 23:16 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 24 Sep 2010 03:16:25 +0000 (23 23:16 -0400)
tree12307ab312c799363905d6e3c725bb7166b4c452
parentc9cb4f0a0e9eb3411dfdc446e4543d48b152f8f5
parent52db5c2539413aded9a7fb855030c6a3a7a25798
Merge branch 'bug1511'
src/or/hibernate.c