Index: src/wp-login.php
===================================================================
--- src/wp-login.php	(revision 37241)
+++ src/wp-login.php	(working copy)
@@ -562,6 +562,7 @@
 case 'resetpass' :
 case 'rp' :
 	list( $rp_path ) = explode( '?', wp_unslash( $_SERVER['REQUEST_URI'] ) );
+	rtrim( $rp_path, '/' );
 	$rp_cookie = 'wp-resetpass-' . COOKIEHASH;
 	if ( isset( $_GET['key'] ) ) {
 		$value = sprintf( '%s:%s', wp_unslash( $_GET['login'] ), wp_unslash( $_GET['key'] ) );