Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
commit64410cc88888ff964a82613cc53475def98d9de7
authorNick Mathewson <nickm@torproject.org>
Mon, 12 Aug 2013 13:44:36 +0000 (12 09:44 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 12 Aug 2013 13:44:36 +0000 (12 09:44 -0400)
tree6b95303507338ff112acef531769fbb4a729abf2
parent0b9c515870f6444fb706590103618c9a2f67c47a
parent41bf8fa8892bc7ee2fc5c1d176535e9218d15afa
Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3