Merge branch 'master' into fix/enumerable-#1240

2020-01-21 16:35:57 +00:00
parent 3700a342b0 b1e811430a
commit 8379d53545
6 changed files with 574 additions and 522 deletions
--- a/contracts/utils/ReentrancyGuard.sol
+++ b/contracts/utils/ReentrancyGuard.sol
@ -12,6 +12,10 @@ pragma solidity ^0.5.0;
 * those functions `private`, and then adding `external` `nonReentrant` entry
 * points to them.
 *
+ * TIP: If you would like to learn more about reentrancy and alternative ways
+ * to protect against it, check out our blog post
+ * https://blog.openzeppelin.com/reentrancy-after-istanbul/[Reentrancy After Istanbul].
+ *
 * _Since v2.5.0:_ this module is now much more gas efficient, given net gas
 * metering changes introduced in the Istanbul hardfork.
 */